Mercurial > emacs
annotate src/w32fns.c @ 48626:bdbf27c68b39
2002-12-02 Andrew Choi <akochoi@shaw.ca>
* make-bin-dist, osx-install: Remove.
* INSTALL: Remove description of make-bin-dist and osx-install.
author | Andrew Choi <akochoi@shaw.ca> |
---|---|
date | Mon, 02 Dec 2002 17:25:20 +0000 |
parents | cf6379011f93 |
children | f0df5f687c15 |
rev | line source |
---|---|
16884
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16602
diff
changeset
|
1 /* Graphical user interface functions for the Microsoft W32 API. |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
2 Copyright (C) 1989, 92, 93, 94, 95, 1996, 1997, 1998, 1999, 2000, 2001 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3 Free Software Foundation, Inc. |
13434 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
9 the Free Software Foundation; either version 2, or (at your option) | |
10 any later version. | |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
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:
13434
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:
13434
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
13434 | 21 |
22 /* Added by Kevin Gallo */ | |
23 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
24 #include <config.h> |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
25 |
13434 | 26 #include <signal.h> |
27 #include <stdio.h> | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
28 #include <limits.h> |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
29 #include <errno.h> |
13434 | 30 |
31 #include "lisp.h" | |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
32 #include "charset.h" |
31110 | 33 #include "dispextern.h" |
13434 | 34 #include "w32term.h" |
37707
6bc1c4d4eb50
(w32_to_x_font): Change prototype to fit the declaration.
Eli Zaretskii <eliz@gnu.org>
parents:
36594
diff
changeset
|
35 #include "keyboard.h" |
13434 | 36 #include "frame.h" |
37 #include "window.h" | |
38 #include "buffer.h" | |
28272
f62bb21d38db
(w32_wnd_proc): Handle WM_MENUSELECT message.
Jason Rumney <jasonr@gnu.org>
parents:
27936
diff
changeset
|
39 #include "fontset.h" |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
40 #include "intervals.h" |
13434 | 41 #include "blockinput.h" |
24412
d11ac02f9d6a
Use epaths.h istead of paths.h.
Richard M. Stallman <rms@gnu.org>
parents:
24339
diff
changeset
|
42 #include "epaths.h" |
16593
4ed80eda6fac
Use new names for w32 files
Geoff Voelker <voelker@cs.washington.edu>
parents:
16588
diff
changeset
|
43 #include "w32heap.h" |
13434 | 44 #include "termhooks.h" |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
45 #include "coding.h" |
25069
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
46 #include "ccl.h" |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
47 #include "systime.h" |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
48 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
49 #include "bitmaps/gray.xbm" |
13434 | 50 |
51 #include <commdlg.h> | |
21884 | 52 #include <shellapi.h> |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
53 #include <ctype.h> |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
54 |
45963
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
55 #include <dlgs.h> |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
56 #define FILE_NAME_TEXT_FIELD edt1 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
57 |
13434 | 58 extern void free_frame_menubar (); |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
59 extern void x_compute_fringe_widths P_ ((struct frame *, int)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
60 extern double atof (); |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
61 extern int w32_console_toggle_lock_key P_ ((int, Lisp_Object)); |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
62 extern void w32_menu_display_help P_ ((HWND, HMENU, UINT, UINT)); |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
63 extern void w32_free_menu_strings P_ ((HWND)); |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
64 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
65 extern int quit_char; |
13434 | 66 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
67 extern char *lispy_function_keys[]; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
68 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
69 /* The gray bitmap `bitmaps/gray'. This is done because w32term.c uses |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
70 it, and including `bitmaps/gray' more than once is a problem when |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
71 config.h defines `static' as an empty replacement string. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
72 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
73 int gray_bitmap_width = gray_width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
74 int gray_bitmap_height = gray_height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
75 unsigned char *gray_bitmap_bits = gray_bits; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
76 |
13434 | 77 /* The colormap for converting color names to RGB values */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
78 Lisp_Object Vw32_color_map; |
13434 | 79 |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
80 /* Non nil if alt key presses are passed on to Windows. */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
81 Lisp_Object Vw32_pass_alt_to_system; |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
82 |
15459
76ff60cd2b8d
(Vwin32_alt_is_meta): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15434
diff
changeset
|
83 /* Non nil if alt key is translated to meta_modifier, nil if it is translated |
76ff60cd2b8d
(Vwin32_alt_is_meta): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15434
diff
changeset
|
84 to alt_modifier. */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
85 Lisp_Object Vw32_alt_is_meta; |
15459
76ff60cd2b8d
(Vwin32_alt_is_meta): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15434
diff
changeset
|
86 |
24339
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
87 /* If non-zero, the windows virtual key code for an alternative quit key. */ |
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
88 Lisp_Object Vw32_quit_key; |
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
89 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
90 /* Non nil if left window key events are passed on to Windows (this only |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
91 affects whether "tapping" the key opens the Start menu). */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
92 Lisp_Object Vw32_pass_lwindow_to_system; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
93 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
94 /* Non nil if right window key events are passed on to Windows (this |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
95 only affects whether "tapping" the key opens the Start menu). */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
96 Lisp_Object Vw32_pass_rwindow_to_system; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
97 |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
98 /* Virtual key code used to generate "phantom" key presses in order |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
99 to stop system from acting on Windows key events. */ |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
100 Lisp_Object Vw32_phantom_key_code; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
101 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
102 /* Modifier associated with the left "Windows" key, or nil to act as a |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
103 normal key. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
104 Lisp_Object Vw32_lwindow_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
105 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
106 /* Modifier associated with the right "Windows" key, or nil to act as a |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
107 normal key. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
108 Lisp_Object Vw32_rwindow_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
109 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
110 /* Modifier associated with the "Apps" key, or nil to act as a normal |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
111 key. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
112 Lisp_Object Vw32_apps_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
113 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
114 /* Value is nil if Num Lock acts as a function key. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
115 Lisp_Object Vw32_enable_num_lock; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
116 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
117 /* Value is nil if Caps Lock acts as a function key. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
118 Lisp_Object Vw32_enable_caps_lock; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
119 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
120 /* Modifier associated with Scroll Lock, or nil to act as a normal key. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
121 Lisp_Object Vw32_scroll_lock_modifier; |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
122 |
27894
6c4ff3519d09
(w32_wnd_proc) [WM_LBUTTON_DOWN, WM_RBUTTON_DOWN, WM_LBUTTON_UP,
Jason Rumney <jasonr@gnu.org>
parents:
27516
diff
changeset
|
123 /* Switch to control whether we inhibit requests for synthesized bold |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
124 and italic versions of fonts. */ |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
125 int w32_enable_synthesized_fonts; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
126 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
127 /* Enable palette management. */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
128 Lisp_Object Vw32_enable_palette; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
129 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
130 /* Control how close left/right button down events must be to |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
131 be converted to a middle button down event. */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
132 Lisp_Object Vw32_mouse_button_tolerance; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
133 |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
134 /* Minimum interval between mouse movement (and scroll bar drag) |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
135 events that are passed on to the event loop. */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
136 Lisp_Object Vw32_mouse_move_interval; |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
137 |
42719
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
138 /* Flag to indicate if XBUTTON events should be passed on to Windows. */ |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
139 int w32_pass_extra_mouse_buttons_to_system; |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
140 |
13434 | 141 /* The name we're using in resource queries. */ |
142 Lisp_Object Vx_resource_name; | |
143 | |
144 /* Non nil if no window manager is in use. */ | |
145 Lisp_Object Vx_no_window_manager; | |
146 | |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
147 /* Non-zero means we're allowed to display a hourglass pointer. */ |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
148 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
149 int display_hourglass_p; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
150 |
13434 | 151 /* The background and shape of the mouse pointer, and shape when not |
152 over text or in the modeline. */ | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
153 |
13434 | 154 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:
36080
diff
changeset
|
155 Lisp_Object Vx_hourglass_pointer_shape, Vx_window_horizontal_drag_shape; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
156 |
13434 | 157 /* The shape when over mouse-sensitive text. */ |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
158 |
13434 | 159 Lisp_Object Vx_sensitive_text_pointer_shape; |
160 | |
161 /* Color of chars displayed in cursor box. */ | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
162 |
13434 | 163 Lisp_Object Vx_cursor_fore_pixel; |
164 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
165 /* Nonzero if using Windows. */ |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
166 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
167 static int w32_in_use; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
168 |
13434 | 169 /* Search path for bitmap files. */ |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
170 |
13434 | 171 Lisp_Object Vx_bitmap_file_path; |
172 | |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
173 /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. */ |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
174 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
175 Lisp_Object Vx_pixel_size_width_font_regexp; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
176 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
177 /* Alist of bdf fonts and the files that define them. */ |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
178 Lisp_Object Vw32_bdf_filename_alist; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
179 |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
180 /* A flag to control whether fonts are matched strictly or not. */ |
24481
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
181 int w32_strict_fontnames; |
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
182 |
24695
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
183 /* A flag to control whether we should only repaint if GetUpdateRect |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
184 indicates there is an update region. */ |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
185 int w32_strict_painting; |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
186 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
187 /* Associative list linking character set strings to Windows codepages. */ |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
188 Lisp_Object Vw32_charset_info_alist; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
189 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
190 /* VIETNAMESE_CHARSET is not defined in some versions of MSVC. */ |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
191 #ifndef VIETNAMESE_CHARSET |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
192 #define VIETNAMESE_CHARSET 163 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
193 #endif |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
194 |
13434 | 195 Lisp_Object Qauto_raise; |
196 Lisp_Object Qauto_lower; | |
197 Lisp_Object Qborder_color; | |
198 Lisp_Object Qborder_width; | |
47161
6c6dca37308c
(Qbox): Make extern.
Juanma Barranquero <lekktu@gmail.com>
parents:
47140
diff
changeset
|
199 extern Lisp_Object Qbox; |
13434 | 200 Lisp_Object Qcursor_color; |
201 Lisp_Object Qcursor_type; | |
202 Lisp_Object Qgeometry; | |
203 Lisp_Object Qicon_left; | |
204 Lisp_Object Qicon_top; | |
205 Lisp_Object Qicon_type; | |
206 Lisp_Object Qicon_name; | |
207 Lisp_Object Qinternal_border_width; | |
208 Lisp_Object Qleft; | |
16259
f54af1701a5f
(Qright): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16106
diff
changeset
|
209 Lisp_Object Qright; |
13434 | 210 Lisp_Object Qmouse_color; |
211 Lisp_Object Qnone; | |
212 Lisp_Object Qparent_id; | |
213 Lisp_Object Qscroll_bar_width; | |
214 Lisp_Object Qsuppress_icon; | |
215 Lisp_Object Qundefined_color; | |
216 Lisp_Object Qvertical_scroll_bars; | |
217 Lisp_Object Qvisibility; | |
218 Lisp_Object Qwindow_id; | |
219 Lisp_Object Qx_frame_parameter; | |
220 Lisp_Object Qx_resource_name; | |
221 Lisp_Object Quser_position; | |
222 Lisp_Object Quser_size; | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
223 Lisp_Object Qscreen_gamma; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
224 Lisp_Object Qline_spacing; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
225 Lisp_Object Qcenter; |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
226 Lisp_Object Qcancel_timer; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
227 Lisp_Object Qhyper; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
228 Lisp_Object Qsuper; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
229 Lisp_Object Qmeta; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
230 Lisp_Object Qalt; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
231 Lisp_Object Qctrl; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
232 Lisp_Object Qcontrol; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
233 Lisp_Object Qshift; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
234 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
235 Lisp_Object Qw32_charset_ansi; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
236 Lisp_Object Qw32_charset_default; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
237 Lisp_Object Qw32_charset_symbol; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
238 Lisp_Object Qw32_charset_shiftjis; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
239 Lisp_Object Qw32_charset_hangeul; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
240 Lisp_Object Qw32_charset_gb2312; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
241 Lisp_Object Qw32_charset_chinesebig5; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
242 Lisp_Object Qw32_charset_oem; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
243 |
31110 | 244 #ifndef JOHAB_CHARSET |
245 #define JOHAB_CHARSET 130 | |
246 #endif | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
247 #ifdef JOHAB_CHARSET |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
248 Lisp_Object Qw32_charset_easteurope; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
249 Lisp_Object Qw32_charset_turkish; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
250 Lisp_Object Qw32_charset_baltic; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
251 Lisp_Object Qw32_charset_russian; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
252 Lisp_Object Qw32_charset_arabic; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
253 Lisp_Object Qw32_charset_greek; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
254 Lisp_Object Qw32_charset_hebrew; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
255 Lisp_Object Qw32_charset_vietnamese; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
256 Lisp_Object Qw32_charset_thai; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
257 Lisp_Object Qw32_charset_johab; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
258 Lisp_Object Qw32_charset_mac; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
259 #endif |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
260 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
261 #ifdef UNICODE_CHARSET |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
262 Lisp_Object Qw32_charset_unicode; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
263 #endif |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
264 |
43398 | 265 Lisp_Object Qfullscreen; |
266 Lisp_Object Qfullwidth; | |
267 Lisp_Object Qfullheight; | |
268 Lisp_Object Qfullboth; | |
269 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
270 extern Lisp_Object Qtop; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
271 extern Lisp_Object Qdisplay; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
272 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
273 /* State variables for emulating a three button mouse. */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
274 #define LMOUSE 1 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
275 #define MMOUSE 2 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
276 #define RMOUSE 4 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
277 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
278 static int button_state = 0; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
279 static W32Msg saved_mouse_button_msg; |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
280 static unsigned mouse_button_timer = 0; /* non-zero when timer is active */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
281 static W32Msg saved_mouse_move_msg; |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
282 static unsigned mouse_move_timer = 0; |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
283 |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
284 /* Window that is tracking the mouse. */ |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
285 static HWND track_mouse_window; |
48375
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
286 |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
287 typedef BOOL (WINAPI * TrackMouseEvent_Proc) ( |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
288 IN OUT LPTRACKMOUSEEVENT lpEventTrack |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
289 ); |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
290 |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
291 TrackMouseEvent_Proc track_mouse_event_fn=NULL; |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
292 |
21874
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
293 /* W95 mousewheel handler */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
294 unsigned int msh_mousewheel = 0; |
21874
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
295 |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
296 /* Timers */ |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
297 #define MOUSE_BUTTON_ID 1 |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
298 #define MOUSE_MOVE_ID 2 |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
299 #define MENU_FREE_ID 3 |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
300 /* The delay (milliseconds) before a menu is freed after WM_EXITMENULOOP |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
301 is received. */ |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
302 #define MENU_FREE_DELAY 1000 |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
303 static unsigned menu_free_timer = 0; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
304 |
13434 | 305 /* The below are defined in frame.c. */ |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
306 |
13434 | 307 extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth; |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
308 extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
309 extern Lisp_Object Qtool_bar_lines; |
13434 | 310 |
311 extern Lisp_Object Vwindow_system_version; | |
312 | |
22625
e7bd87148368
(Fx_list_fonts): Bring arglist into sync with xfns.c.
Richard M. Stallman <rms@gnu.org>
parents:
22078
diff
changeset
|
313 Lisp_Object Qface_set_after_frame_default; |
e7bd87148368
(Fx_list_fonts): Bring arglist into sync with xfns.c.
Richard M. Stallman <rms@gnu.org>
parents:
22078
diff
changeset
|
314 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
315 #ifdef GLYPH_DEBUG |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
316 int image_cache_refcount, dpyinfo_refcount; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
317 #endif |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
318 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
319 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
320 /* From w32term.c. */ |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
321 extern Lisp_Object Vw32_num_mouse_buttons; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
322 extern Lisp_Object Vw32_recognize_altgr; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
323 |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
324 extern HWND w32_system_caret_hwnd; |
42865
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
325 |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
326 extern int w32_system_caret_height; |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
327 extern int w32_system_caret_x; |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
328 extern int w32_system_caret_y; |
42865
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
329 extern int w32_use_visible_system_caret; |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
330 |
42918
9b06036a8c5e
(syms_of_w32fns): Initialize w32_visible_system_caret_hwnd.
Jason Rumney <jasonr@gnu.org>
parents:
42865
diff
changeset
|
331 static HWND w32_visible_system_caret_hwnd; |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
332 |
13434 | 333 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
334 /* Error if we are not connected to MS-Windows. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
335 void |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
336 check_w32 () |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
337 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
338 if (! w32_in_use) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
339 error ("MS-Windows not in use or not initialized"); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
340 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
341 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
342 /* Nonzero if we can use mouse menus. |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
343 You should not call this unless HAVE_MENUS is defined. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
344 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
345 int |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
346 have_menus_p () |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
347 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
348 return w32_in_use; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
349 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
350 |
13434 | 351 /* Extract a frame as a FRAME_PTR, defaulting to the selected frame |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
352 and checking validity for W32. */ |
13434 | 353 |
354 FRAME_PTR | |
355 check_x_frame (frame) | |
356 Lisp_Object frame; | |
357 { | |
358 FRAME_PTR f; | |
359 | |
360 if (NILP (frame)) | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
361 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
362 CHECK_LIVE_FRAME (frame); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
363 f = XFRAME (frame); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
364 if (! FRAME_W32_P (f)) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
365 error ("non-w32 frame used"); |
13434 | 366 return f; |
367 } | |
368 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
369 /* Let the user specify a display with a frame. |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
370 nil stands for the selected frame--or, if that is not a w32 frame, |
13434 | 371 the first display on the list. */ |
372 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
373 static struct w32_display_info * |
13434 | 374 check_x_display_info (frame) |
375 Lisp_Object frame; | |
376 { | |
377 if (NILP (frame)) | |
378 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
379 struct frame *sf = XFRAME (selected_frame); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
380 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
381 if (FRAME_W32_P (sf) && FRAME_LIVE_P (sf)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
382 return FRAME_W32_DISPLAY_INFO (sf); |
13434 | 383 else |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
384 return &one_w32_display_info; |
13434 | 385 } |
386 else if (STRINGP (frame)) | |
387 return x_display_info_for_name (frame); | |
388 else | |
389 { | |
390 FRAME_PTR f; | |
391 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
392 CHECK_LIVE_FRAME (frame); |
13434 | 393 f = XFRAME (frame); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
394 if (! FRAME_W32_P (f)) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
395 error ("non-w32 frame used"); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
396 return FRAME_W32_DISPLAY_INFO (f); |
13434 | 397 } |
398 } | |
399 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
400 /* Return the Emacs frame-object corresponding to an w32 window. |
13434 | 401 It could be the frame's main window or an icon window. */ |
402 | |
403 /* This function can be called during GC, so use GC_xxx type test macros. */ | |
404 | |
405 struct frame * | |
406 x_window_to_frame (dpyinfo, wdesc) | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
407 struct w32_display_info *dpyinfo; |
13434 | 408 HWND wdesc; |
409 { | |
410 Lisp_Object tail, frame; | |
411 struct frame *f; | |
412 | |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
413 for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail)) |
13434 | 414 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
415 frame = XCAR (tail); |
13434 | 416 if (!GC_FRAMEP (frame)) |
417 continue; | |
418 f = XFRAME (frame); | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
25646
diff
changeset
|
419 if (!FRAME_W32_P (f) || FRAME_W32_DISPLAY_INFO (f) != dpyinfo) |
13434 | 420 continue; |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
421 if (f->output_data.w32->hourglass_window == wdesc) |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
422 return f; |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
423 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
424 if (FRAME_W32_WINDOW (f) == wdesc) |
13434 | 425 return f; |
426 } | |
427 return 0; | |
428 } | |
429 | |
430 | |
431 | |
432 /* Code to deal with bitmaps. Bitmaps are referenced by their bitmap | |
433 id, which is just an int that this section returns. Bitmaps are | |
434 reference counted so they can be shared among frames. | |
435 | |
436 Bitmap indices are guaranteed to be > 0, so a negative number can | |
437 be used to indicate no bitmap. | |
438 | |
439 If you use x_create_bitmap_from_data, then you must keep track of | |
440 the bitmaps yourself. That is, creating a bitmap from the same | |
441 data more than once will not be caught. */ | |
442 | |
443 | |
444 /* Functions to access the contents of a bitmap, given an id. */ | |
445 | |
446 int | |
447 x_bitmap_height (f, id) | |
448 FRAME_PTR f; | |
449 int id; | |
450 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
451 return FRAME_W32_DISPLAY_INFO (f)->bitmaps[id - 1].height; |
13434 | 452 } |
453 | |
454 int | |
455 x_bitmap_width (f, id) | |
456 FRAME_PTR f; | |
457 int id; | |
458 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
459 return FRAME_W32_DISPLAY_INFO (f)->bitmaps[id - 1].width; |
13434 | 460 } |
461 | |
462 int | |
463 x_bitmap_pixmap (f, id) | |
464 FRAME_PTR f; | |
465 int id; | |
466 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
467 return (int) FRAME_W32_DISPLAY_INFO (f)->bitmaps[id - 1].pixmap; |
13434 | 468 } |
469 | |
470 | |
471 /* Allocate a new bitmap record. Returns index of new record. */ | |
472 | |
473 static int | |
474 x_allocate_bitmap_record (f) | |
475 FRAME_PTR f; | |
476 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
477 struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); |
13434 | 478 int i; |
479 | |
480 if (dpyinfo->bitmaps == NULL) | |
481 { | |
482 dpyinfo->bitmaps_size = 10; | |
483 dpyinfo->bitmaps | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
484 = (struct w32_bitmap_record *) xmalloc (dpyinfo->bitmaps_size * sizeof (struct w32_bitmap_record)); |
13434 | 485 dpyinfo->bitmaps_last = 1; |
486 return 1; | |
487 } | |
488 | |
489 if (dpyinfo->bitmaps_last < dpyinfo->bitmaps_size) | |
490 return ++dpyinfo->bitmaps_last; | |
491 | |
492 for (i = 0; i < dpyinfo->bitmaps_size; ++i) | |
493 if (dpyinfo->bitmaps[i].refcount == 0) | |
494 return i + 1; | |
495 | |
496 dpyinfo->bitmaps_size *= 2; | |
497 dpyinfo->bitmaps | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
498 = (struct w32_bitmap_record *) xrealloc (dpyinfo->bitmaps, |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
499 dpyinfo->bitmaps_size * sizeof (struct w32_bitmap_record)); |
13434 | 500 return ++dpyinfo->bitmaps_last; |
501 } | |
502 | |
503 /* Add one reference to the reference count of the bitmap with id ID. */ | |
504 | |
505 void | |
506 x_reference_bitmap (f, id) | |
507 FRAME_PTR f; | |
508 int id; | |
509 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
510 ++FRAME_W32_DISPLAY_INFO (f)->bitmaps[id - 1].refcount; |
13434 | 511 } |
512 | |
513 /* Create a bitmap for frame F from a HEIGHT x WIDTH array of bits at BITS. */ | |
514 | |
515 int | |
516 x_create_bitmap_from_data (f, bits, width, height) | |
517 struct frame *f; | |
518 char *bits; | |
519 unsigned int width, height; | |
520 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
521 struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); |
13434 | 522 Pixmap bitmap; |
523 int id; | |
524 | |
525 bitmap = CreateBitmap (width, height, | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
526 FRAME_W32_DISPLAY_INFO (XFRAME (frame))->n_planes, |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
527 FRAME_W32_DISPLAY_INFO (XFRAME (frame))->n_cbits, |
13434 | 528 bits); |
529 | |
530 if (! bitmap) | |
531 return -1; | |
532 | |
533 id = x_allocate_bitmap_record (f); | |
534 dpyinfo->bitmaps[id - 1].pixmap = bitmap; | |
535 dpyinfo->bitmaps[id - 1].file = NULL; | |
536 dpyinfo->bitmaps[id - 1].hinst = NULL; | |
537 dpyinfo->bitmaps[id - 1].refcount = 1; | |
538 dpyinfo->bitmaps[id - 1].depth = 1; | |
539 dpyinfo->bitmaps[id - 1].height = height; | |
540 dpyinfo->bitmaps[id - 1].width = width; | |
541 | |
542 return id; | |
543 } | |
544 | |
545 /* Create bitmap from file FILE for frame F. */ | |
546 | |
547 int | |
548 x_create_bitmap_from_file (f, file) | |
549 struct frame *f; | |
550 Lisp_Object file; | |
551 { | |
552 return -1; | |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
553 #if 0 /* TODO : bitmap support */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
554 struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); |
13434 | 555 unsigned int width, height; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
556 HBITMAP bitmap; |
13434 | 557 int xhot, yhot, result, id; |
558 Lisp_Object found; | |
559 int fd; | |
560 char *filename; | |
561 HINSTANCE hinst; | |
562 | |
563 /* Look for an existing bitmap with the same name. */ | |
564 for (id = 0; id < dpyinfo->bitmaps_last; ++id) | |
565 { | |
566 if (dpyinfo->bitmaps[id].refcount | |
567 && dpyinfo->bitmaps[id].file | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
568 && !strcmp (dpyinfo->bitmaps[id].file, (char *) SDATA (file))) |
13434 | 569 { |
570 ++dpyinfo->bitmaps[id].refcount; | |
571 return id + 1; | |
572 } | |
573 } | |
574 | |
575 /* 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:
44642
diff
changeset
|
576 fd = openp (Vx_bitmap_file_path, file, Qnil, &found, Qnil); |
13434 | 577 if (fd < 0) |
578 return -1; | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
579 emacs_close (fd); |
13434 | 580 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
581 filename = (char *) SDATA (found); |
13434 | 582 |
583 hinst = LoadLibraryEx (filename, NULL, LOAD_LIBRARY_AS_DATAFILE); | |
584 | |
585 if (hinst == NULL) | |
586 return -1; | |
587 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
588 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
589 result = XReadBitmapFile (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), |
13434 | 590 filename, &width, &height, &bitmap, &xhot, &yhot); |
591 if (result != BitmapSuccess) | |
592 return -1; | |
593 | |
594 id = x_allocate_bitmap_record (f); | |
595 dpyinfo->bitmaps[id - 1].pixmap = bitmap; | |
596 dpyinfo->bitmaps[id - 1].refcount = 1; | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
597 dpyinfo->bitmaps[id - 1].file = (char *) xmalloc (SCHARS (file) + 1); |
13434 | 598 dpyinfo->bitmaps[id - 1].depth = 1; |
599 dpyinfo->bitmaps[id - 1].height = height; | |
600 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:
46293
diff
changeset
|
601 strcpy (dpyinfo->bitmaps[id - 1].file, SDATA (file)); |
13434 | 602 |
603 return id; | |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
604 #endif /* TODO */ |
13434 | 605 } |
606 | |
607 /* Remove reference to bitmap with id number ID. */ | |
608 | |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
609 void |
13434 | 610 x_destroy_bitmap (f, id) |
611 FRAME_PTR f; | |
612 int id; | |
613 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
614 struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); |
13434 | 615 |
616 if (id > 0) | |
617 { | |
618 --dpyinfo->bitmaps[id - 1].refcount; | |
619 if (dpyinfo->bitmaps[id - 1].refcount == 0) | |
620 { | |
621 BLOCK_INPUT; | |
622 DeleteObject (dpyinfo->bitmaps[id - 1].pixmap); | |
623 if (dpyinfo->bitmaps[id - 1].file) | |
624 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
625 xfree (dpyinfo->bitmaps[id - 1].file); |
13434 | 626 dpyinfo->bitmaps[id - 1].file = NULL; |
627 } | |
628 UNBLOCK_INPUT; | |
629 } | |
630 } | |
631 } | |
632 | |
633 /* Free all the bitmaps for the display specified by DPYINFO. */ | |
634 | |
635 static void | |
636 x_destroy_all_bitmaps (dpyinfo) | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
637 struct w32_display_info *dpyinfo; |
13434 | 638 { |
639 int i; | |
640 for (i = 0; i < dpyinfo->bitmaps_last; i++) | |
641 if (dpyinfo->bitmaps[i].refcount > 0) | |
642 { | |
643 DeleteObject (dpyinfo->bitmaps[i].pixmap); | |
644 if (dpyinfo->bitmaps[i].file) | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
645 xfree (dpyinfo->bitmaps[i].file); |
13434 | 646 } |
647 dpyinfo->bitmaps_last = 0; | |
648 } | |
649 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
650 /* Connect the frame-parameter names for W32 frames |
13434 | 651 to the ways of passing the parameter values to the window system. |
652 | |
653 The name of a parameter, as a Lisp symbol, | |
654 has an `x-frame-parameter' property which is an integer in Lisp | |
655 but can be interpreted as an `enum x_frame_parm' in C. */ | |
656 | |
657 enum x_frame_parm | |
658 { | |
659 X_PARM_FOREGROUND_COLOR, | |
660 X_PARM_BACKGROUND_COLOR, | |
661 X_PARM_MOUSE_COLOR, | |
662 X_PARM_CURSOR_COLOR, | |
663 X_PARM_BORDER_COLOR, | |
664 X_PARM_ICON_TYPE, | |
665 X_PARM_FONT, | |
666 X_PARM_BORDER_WIDTH, | |
667 X_PARM_INTERNAL_BORDER_WIDTH, | |
668 X_PARM_NAME, | |
669 X_PARM_AUTORAISE, | |
670 X_PARM_AUTOLOWER, | |
671 X_PARM_VERT_SCROLL_BAR, | |
672 X_PARM_VISIBILITY, | |
673 X_PARM_MENU_BAR_LINES | |
674 }; | |
675 | |
676 | |
677 struct x_frame_parm_table | |
678 { | |
679 char *name; | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
680 void (*setter) P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
13434 | 681 }; |
682 | |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
683 BOOL my_show_window P_ ((struct frame *, HWND, int)); |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
684 void my_set_window_pos P_ ((HWND, HWND, int, int, int, int, UINT)); |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
685 static Lisp_Object unwind_create_frame P_ ((Lisp_Object)); |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
686 static Lisp_Object unwind_create_tip_frame P_ ((Lisp_Object)); |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
687 static void x_change_window_heights P_ ((Lisp_Object, int)); |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
688 /* TODO: Native Input Method support; see x_create_im. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
689 void x_set_foreground_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
690 static void x_set_line_spacing P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
43398 | 691 static void x_set_fullscreen P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
692 void x_set_background_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
693 void x_set_mouse_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
694 void x_set_cursor_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
695 void x_set_border_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
696 void x_set_cursor_type P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
697 void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
698 void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
699 void x_set_font P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
41726
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
700 static void x_set_fringe_width P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
701 void x_set_border_width P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
702 void x_set_internal_border_width P_ ((struct frame *, Lisp_Object, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
703 Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
704 void x_explicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
705 void x_set_autoraise P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
706 void x_set_autolower P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
707 void x_set_vertical_scroll_bars P_ ((struct frame *, Lisp_Object, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
708 Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
709 void x_set_visibility P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
710 void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
711 void x_set_scroll_bar_width P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
712 void x_set_title P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
713 void x_set_unsplittable P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
714 void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
715 static void x_set_screen_gamma P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
716 static void x_edge_detection P_ ((struct frame *, struct image *, Lisp_Object, |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
717 Lisp_Object)); |
13434 | 718 |
719 static struct x_frame_parm_table x_frame_parms[] = | |
720 { | |
42537
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
721 {"auto-raise", x_set_autoraise}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
722 {"auto-lower", x_set_autolower}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
723 {"background-color", x_set_background_color}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
724 {"border-color", x_set_border_color}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
725 {"border-width", x_set_border_width}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
726 {"cursor-color", x_set_cursor_color}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
727 {"cursor-type", x_set_cursor_type}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
728 {"font", x_set_font}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
729 {"foreground-color", x_set_foreground_color}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
730 {"icon-name", x_set_icon_name}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
731 {"icon-type", x_set_icon_type}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
732 {"internal-border-width", x_set_internal_border_width}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
733 {"menu-bar-lines", x_set_menu_bar_lines}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
734 {"mouse-color", x_set_mouse_color}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
735 {"name", x_explicitly_set_name}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
736 {"scroll-bar-width", x_set_scroll_bar_width}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
737 {"title", x_set_title}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
738 {"unsplittable", x_set_unsplittable}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
739 {"vertical-scroll-bars", x_set_vertical_scroll_bars}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
740 {"visibility", x_set_visibility}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
741 {"tool-bar-lines", x_set_tool_bar_lines}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
742 {"screen-gamma", x_set_screen_gamma}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
743 {"line-spacing", x_set_line_spacing}, |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
744 {"left-fringe", x_set_fringe_width}, |
43398 | 745 {"right-fringe", x_set_fringe_width}, |
746 {"fullscreen", x_set_fullscreen}, | |
13434 | 747 }; |
748 | |
749 /* Attach the `x-frame-parameter' properties to | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
750 the Lisp symbol names of parameters relevant to W32. */ |
13434 | 751 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
752 void |
13434 | 753 init_x_parm_symbols () |
754 { | |
755 int i; | |
756 | |
757 for (i = 0; i < sizeof (x_frame_parms) / sizeof (x_frame_parms[0]); i++) | |
758 Fput (intern (x_frame_parms[i].name), Qx_frame_parameter, | |
759 make_number (i)); | |
760 } | |
761 | |
43398 | 762 /* Really try to move where we want to be in case of fullscreen. Some WMs |
763 moves the window where we tell them. Some (mwm, twm) moves the outer | |
764 window manager window there instead. | |
765 Try to compensate for those WM here. */ | |
766 static void | |
767 x_fullscreen_move (f, new_top, new_left) | |
768 struct frame *f; | |
769 int new_top; | |
770 int new_left; | |
771 { | |
772 if (new_top != f->output_data.w32->top_pos | |
773 || new_left != f->output_data.w32->left_pos) | |
774 { | |
775 int move_x = new_left; | |
776 int move_y = new_top; | |
777 | |
778 f->output_data.w32->want_fullscreen |= FULLSCREEN_MOVE_WAIT; | |
779 x_set_offset (f, move_x, move_y, 1); | |
780 } | |
781 } | |
782 | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
783 /* Change the parameters of frame F as specified by ALIST. |
13434 | 784 If a parameter is not specially recognized, do nothing; |
785 otherwise call the `x_set_...' function for that parameter. */ | |
786 | |
787 void | |
788 x_set_frame_parameters (f, alist) | |
789 FRAME_PTR f; | |
790 Lisp_Object alist; | |
791 { | |
792 Lisp_Object tail; | |
793 | |
794 /* If both of these parameters are present, it's more efficient to | |
795 set them both at once. So we wait until we've looked at the | |
796 entire list before we set them. */ | |
16106
fdd1b2ade15d
(x_set_frame_parameters): Make height and width ints.
Richard M. Stallman <rms@gnu.org>
parents:
16089
diff
changeset
|
797 int width, height; |
13434 | 798 |
799 /* Same here. */ | |
800 Lisp_Object left, top; | |
801 | |
802 /* Same with these. */ | |
803 Lisp_Object icon_left, icon_top; | |
804 | |
805 /* Record in these vectors all the parms specified. */ | |
806 Lisp_Object *parms; | |
807 Lisp_Object *values; | |
25289
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
808 int i, p; |
13434 | 809 int left_no_change = 0, top_no_change = 0; |
810 int icon_left_no_change = 0, icon_top_no_change = 0; | |
43398 | 811 int fullscreen_is_being_set = 0; |
13434 | 812 |
24211
9ecc7b851682
(x_set_frame_parameters): gcpro as needed.
Richard M. Stallman <rms@gnu.org>
parents:
24206
diff
changeset
|
813 struct gcpro gcpro1, gcpro2; |
9ecc7b851682
(x_set_frame_parameters): gcpro as needed.
Richard M. Stallman <rms@gnu.org>
parents:
24206
diff
changeset
|
814 |
13434 | 815 i = 0; |
816 for (tail = alist; CONSP (tail); tail = Fcdr (tail)) | |
817 i++; | |
818 | |
819 parms = (Lisp_Object *) alloca (i * sizeof (Lisp_Object)); | |
820 values = (Lisp_Object *) alloca (i * sizeof (Lisp_Object)); | |
821 | |
822 /* Extract parm names and values into those vectors. */ | |
823 | |
824 i = 0; | |
825 for (tail = alist; CONSP (tail); tail = Fcdr (tail)) | |
826 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
827 Lisp_Object elt; |
13434 | 828 |
829 elt = Fcar (tail); | |
830 parms[i] = Fcar (elt); | |
831 values[i] = Fcdr (elt); | |
832 i++; | |
833 } | |
24211
9ecc7b851682
(x_set_frame_parameters): gcpro as needed.
Richard M. Stallman <rms@gnu.org>
parents:
24206
diff
changeset
|
834 /* TAIL and ALIST are not used again below here. */ |
9ecc7b851682
(x_set_frame_parameters): gcpro as needed.
Richard M. Stallman <rms@gnu.org>
parents:
24206
diff
changeset
|
835 alist = tail = Qnil; |
9ecc7b851682
(x_set_frame_parameters): gcpro as needed.
Richard M. Stallman <rms@gnu.org>
parents:
24206
diff
changeset
|
836 |
9ecc7b851682
(x_set_frame_parameters): gcpro as needed.
Richard M. Stallman <rms@gnu.org>
parents:
24206
diff
changeset
|
837 GCPRO2 (*parms, *values); |
9ecc7b851682
(x_set_frame_parameters): gcpro as needed.
Richard M. Stallman <rms@gnu.org>
parents:
24206
diff
changeset
|
838 gcpro1.nvars = i; |
9ecc7b851682
(x_set_frame_parameters): gcpro as needed.
Richard M. Stallman <rms@gnu.org>
parents:
24206
diff
changeset
|
839 gcpro2.nvars = i; |
9ecc7b851682
(x_set_frame_parameters): gcpro as needed.
Richard M. Stallman <rms@gnu.org>
parents:
24206
diff
changeset
|
840 |
9ecc7b851682
(x_set_frame_parameters): gcpro as needed.
Richard M. Stallman <rms@gnu.org>
parents:
24206
diff
changeset
|
841 /* There is no need to gcpro LEFT, TOP, ICON_LEFT, or ICON_TOP, |
9ecc7b851682
(x_set_frame_parameters): gcpro as needed.
Richard M. Stallman <rms@gnu.org>
parents:
24206
diff
changeset
|
842 because their values appear in VALUES and strings are not valid. */ |
16106
fdd1b2ade15d
(x_set_frame_parameters): Make height and width ints.
Richard M. Stallman <rms@gnu.org>
parents:
16089
diff
changeset
|
843 top = left = Qunbound; |
13434 | 844 icon_left = icon_top = Qunbound; |
845 | |
16106
fdd1b2ade15d
(x_set_frame_parameters): Make height and width ints.
Richard M. Stallman <rms@gnu.org>
parents:
16089
diff
changeset
|
846 /* Provide default values for HEIGHT and WIDTH. */ |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
847 if (FRAME_NEW_WIDTH (f)) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
848 width = FRAME_NEW_WIDTH (f); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
849 else |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
850 width = FRAME_WIDTH (f); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
851 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
852 if (FRAME_NEW_HEIGHT (f)) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
853 height = FRAME_NEW_HEIGHT (f); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
854 else |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
855 height = FRAME_HEIGHT (f); |
16106
fdd1b2ade15d
(x_set_frame_parameters): Make height and width ints.
Richard M. Stallman <rms@gnu.org>
parents:
16089
diff
changeset
|
856 |
25289
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
857 /* Process foreground_color and background_color before anything else. |
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
858 They are independent of other properties, but other properties (e.g., |
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
859 cursor_color) are dependent upon them. */ |
41726
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
860 /* Process default font as well, since fringe widths depends on it. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
861 for (p = 0; p < i; p++) |
25289
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
862 { |
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
863 Lisp_Object prop, val; |
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
864 |
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
865 prop = parms[p]; |
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
866 val = values[p]; |
41726
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
867 if (EQ (prop, Qforeground_color) |
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
868 || EQ (prop, Qbackground_color) |
43398 | 869 || EQ (prop, Qfont) |
870 || EQ (prop, Qfullscreen)) | |
25289
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
871 { |
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
872 register Lisp_Object param_index, old_value; |
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
873 |
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
874 old_value = get_frame_param (f, prop); |
43398 | 875 fullscreen_is_being_set |= EQ (prop, Qfullscreen); |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
876 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
877 if (NILP (Fequal (val, old_value))) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
878 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
879 store_frame_param (f, prop, val); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
880 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
881 param_index = Fget (prop, Qx_frame_parameter); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
882 if (NATNUMP (param_index) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
883 && (XFASTINT (param_index) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
884 < sizeof (x_frame_parms)/sizeof (x_frame_parms[0]))) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
885 (*x_frame_parms[XINT (param_index)].setter)(f, val, old_value); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
886 } |
25289
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
887 } |
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
888 } |
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
889 |
13434 | 890 /* Now process them in reverse of specified order. */ |
891 for (i--; i >= 0; i--) | |
892 { | |
893 Lisp_Object prop, val; | |
894 | |
895 prop = parms[i]; | |
896 val = values[i]; | |
897 | |
16106
fdd1b2ade15d
(x_set_frame_parameters): Make height and width ints.
Richard M. Stallman <rms@gnu.org>
parents:
16089
diff
changeset
|
898 if (EQ (prop, Qwidth) && NUMBERP (val)) |
fdd1b2ade15d
(x_set_frame_parameters): Make height and width ints.
Richard M. Stallman <rms@gnu.org>
parents:
16089
diff
changeset
|
899 width = XFASTINT (val); |
fdd1b2ade15d
(x_set_frame_parameters): Make height and width ints.
Richard M. Stallman <rms@gnu.org>
parents:
16089
diff
changeset
|
900 else if (EQ (prop, Qheight) && NUMBERP (val)) |
fdd1b2ade15d
(x_set_frame_parameters): Make height and width ints.
Richard M. Stallman <rms@gnu.org>
parents:
16089
diff
changeset
|
901 height = XFASTINT (val); |
13434 | 902 else if (EQ (prop, Qtop)) |
903 top = val; | |
904 else if (EQ (prop, Qleft)) | |
905 left = val; | |
906 else if (EQ (prop, Qicon_top)) | |
907 icon_top = val; | |
908 else if (EQ (prop, Qicon_left)) | |
909 icon_left = val; | |
41726
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
910 else if (EQ (prop, Qforeground_color) |
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
911 || EQ (prop, Qbackground_color) |
43398 | 912 || EQ (prop, Qfont) |
913 || EQ (prop, Qfullscreen)) | |
25289
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
914 /* Processed above. */ |
64b742df49ca
(x_set_frame_parameters): Set foreground and
Geoff Voelker <voelker@cs.washington.edu>
parents:
25235
diff
changeset
|
915 continue; |
13434 | 916 else |
917 { | |
918 register Lisp_Object param_index, old_value; | |
919 | |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
920 old_value = get_frame_param (f, prop); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
921 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
922 store_frame_param (f, prop, val); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
923 |
13434 | 924 param_index = Fget (prop, Qx_frame_parameter); |
925 if (NATNUMP (param_index) | |
926 && (XFASTINT (param_index) | |
927 < sizeof (x_frame_parms)/sizeof (x_frame_parms[0]))) | |
14353 | 928 (*x_frame_parms[XINT (param_index)].setter)(f, val, old_value); |
13434 | 929 } |
930 } | |
931 | |
932 /* Don't die if just one of these was set. */ | |
933 if (EQ (left, Qunbound)) | |
934 { | |
935 left_no_change = 1; | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
936 if (f->output_data.w32->left_pos < 0) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
937 left = Fcons (Qplus, Fcons (make_number (f->output_data.w32->left_pos), Qnil)); |
13434 | 938 else |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
939 XSETINT (left, f->output_data.w32->left_pos); |
13434 | 940 } |
941 if (EQ (top, Qunbound)) | |
942 { | |
943 top_no_change = 1; | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
944 if (f->output_data.w32->top_pos < 0) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
945 top = Fcons (Qplus, Fcons (make_number (f->output_data.w32->top_pos), Qnil)); |
13434 | 946 else |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
947 XSETINT (top, f->output_data.w32->top_pos); |
13434 | 948 } |
949 | |
950 /* If one of the icon positions was not set, preserve or default it. */ | |
951 if (EQ (icon_left, Qunbound) || ! INTEGERP (icon_left)) | |
952 { | |
953 icon_left_no_change = 1; | |
954 icon_left = Fcdr (Fassq (Qicon_left, f->param_alist)); | |
955 if (NILP (icon_left)) | |
956 XSETINT (icon_left, 0); | |
957 } | |
958 if (EQ (icon_top, Qunbound) || ! INTEGERP (icon_top)) | |
959 { | |
960 icon_top_no_change = 1; | |
961 icon_top = Fcdr (Fassq (Qicon_top, f->param_alist)); | |
962 if (NILP (icon_top)) | |
963 XSETINT (icon_top, 0); | |
964 } | |
965 | |
43398 | 966 if (FRAME_VISIBLE_P (f) && fullscreen_is_being_set) |
967 { | |
968 /* If the frame is visible already and the fullscreen parameter is | |
969 being set, it is too late to set WM manager hints to specify | |
970 size and position. | |
971 Here we first get the width, height and position that applies to | |
972 fullscreen. We then move the frame to the appropriate | |
973 position. Resize of the frame is taken care of in the code after | |
974 this if-statement. */ | |
975 int new_left, new_top; | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
976 |
43398 | 977 x_fullscreen_adjust (f, &width, &height, &new_top, &new_left); |
978 x_fullscreen_move (f, new_top, new_left); | |
979 } | |
980 | |
13434 | 981 /* Don't set these parameters unless they've been explicitly |
982 specified. The window might be mapped or resized while we're in | |
983 this function, and we don't want to override that unless the lisp | |
984 code has asked for it. | |
985 | |
986 Don't set these parameters unless they actually differ from the | |
987 window's current parameters; the window may not actually exist | |
988 yet. */ | |
989 { | |
990 Lisp_Object frame; | |
991 | |
992 check_frame_size (f, &height, &width); | |
993 | |
994 XSETFRAME (frame, f); | |
995 | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
996 if (width != FRAME_WIDTH (f) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
997 || height != FRAME_HEIGHT (f) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
998 || FRAME_NEW_HEIGHT (f) || FRAME_NEW_WIDTH (f)) |
16106
fdd1b2ade15d
(x_set_frame_parameters): Make height and width ints.
Richard M. Stallman <rms@gnu.org>
parents:
16089
diff
changeset
|
999 Fset_frame_size (frame, make_number (width), make_number (height)); |
13434 | 1000 |
1001 if ((!NILP (left) || !NILP (top)) | |
1002 && ! (left_no_change && top_no_change) | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1003 && ! (NUMBERP (left) && XINT (left) == f->output_data.w32->left_pos |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1004 && NUMBERP (top) && XINT (top) == f->output_data.w32->top_pos)) |
13434 | 1005 { |
1006 int leftpos = 0; | |
1007 int toppos = 0; | |
1008 | |
1009 /* Record the signs. */ | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1010 f->output_data.w32->size_hint_flags &= ~ (XNegative | YNegative); |
13434 | 1011 if (EQ (left, Qminus)) |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1012 f->output_data.w32->size_hint_flags |= XNegative; |
13434 | 1013 else if (INTEGERP (left)) |
1014 { | |
1015 leftpos = XINT (left); | |
1016 if (leftpos < 0) | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1017 f->output_data.w32->size_hint_flags |= XNegative; |
13434 | 1018 } |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1019 else if (CONSP (left) && EQ (XCAR (left), Qminus) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1020 && CONSP (XCDR (left)) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1021 && INTEGERP (XCAR (XCDR (left)))) |
13434 | 1022 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1023 leftpos = - XINT (XCAR (XCDR (left))); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1024 f->output_data.w32->size_hint_flags |= XNegative; |
13434 | 1025 } |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1026 else if (CONSP (left) && EQ (XCAR (left), Qplus) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1027 && CONSP (XCDR (left)) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1028 && INTEGERP (XCAR (XCDR (left)))) |
13434 | 1029 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1030 leftpos = XINT (XCAR (XCDR (left))); |
13434 | 1031 } |
1032 | |
1033 if (EQ (top, Qminus)) | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1034 f->output_data.w32->size_hint_flags |= YNegative; |
13434 | 1035 else if (INTEGERP (top)) |
1036 { | |
1037 toppos = XINT (top); | |
1038 if (toppos < 0) | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1039 f->output_data.w32->size_hint_flags |= YNegative; |
13434 | 1040 } |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1041 else if (CONSP (top) && EQ (XCAR (top), Qminus) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1042 && CONSP (XCDR (top)) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1043 && INTEGERP (XCAR (XCDR (top)))) |
13434 | 1044 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1045 toppos = - XINT (XCAR (XCDR (top))); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1046 f->output_data.w32->size_hint_flags |= YNegative; |
13434 | 1047 } |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1048 else if (CONSP (top) && EQ (XCAR (top), Qplus) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1049 && CONSP (XCDR (top)) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1050 && INTEGERP (XCAR (XCDR (top)))) |
13434 | 1051 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1052 toppos = XINT (XCAR (XCDR (top))); |
13434 | 1053 } |
1054 | |
1055 | |
1056 /* Store the numeric value of the position. */ | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1057 f->output_data.w32->top_pos = toppos; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1058 f->output_data.w32->left_pos = leftpos; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1059 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1060 f->output_data.w32->win_gravity = NorthWestGravity; |
13434 | 1061 |
1062 /* Actually set that position, and convert to absolute. */ | |
1063 x_set_offset (f, leftpos, toppos, -1); | |
1064 } | |
1065 | |
1066 if ((!NILP (icon_left) || !NILP (icon_top)) | |
1067 && ! (icon_left_no_change && icon_top_no_change)) | |
1068 x_wm_set_icon_position (f, XINT (icon_left), XINT (icon_top)); | |
1069 } | |
24211
9ecc7b851682
(x_set_frame_parameters): gcpro as needed.
Richard M. Stallman <rms@gnu.org>
parents:
24206
diff
changeset
|
1070 |
9ecc7b851682
(x_set_frame_parameters): gcpro as needed.
Richard M. Stallman <rms@gnu.org>
parents:
24206
diff
changeset
|
1071 UNGCPRO; |
13434 | 1072 } |
1073 | |
1074 /* Store the screen positions of frame F into XPTR and YPTR. | |
1075 These are the positions of the containing window manager window, | |
1076 not Emacs's own window. */ | |
1077 | |
1078 void | |
1079 x_real_positions (f, xptr, yptr) | |
1080 FRAME_PTR f; | |
1081 int *xptr, *yptr; | |
1082 { | |
1083 POINT pt; | |
43398 | 1084 RECT rect; |
1085 | |
1086 GetClientRect(FRAME_W32_WINDOW(f), &rect); | |
1087 AdjustWindowRect(&rect, f->output_data.w32->dwStyle, FRAME_EXTERNAL_MENU_BAR(f)); | |
1088 | |
1089 pt.x = rect.left; | |
1090 pt.y = rect.top; | |
14353 | 1091 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1092 ClientToScreen (FRAME_W32_WINDOW(f), &pt); |
13434 | 1093 |
43398 | 1094 /* Remember x_pixels_diff and y_pixels_diff. */ |
1095 f->output_data.w32->x_pixels_diff = pt.x - rect.left; | |
1096 f->output_data.w32->y_pixels_diff = pt.y - rect.top; | |
1097 | |
13434 | 1098 *xptr = pt.x; |
1099 *yptr = pt.y; | |
1100 } | |
1101 | |
1102 /* Insert a description of internally-recorded parameters of frame X | |
1103 into the parameter alist *ALISTPTR that is to be given to the user. | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1104 Only parameters that are specific to W32 |
13434 | 1105 and whose values are not correctly recorded in the frame's |
1106 param_alist need to be considered here. */ | |
1107 | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
1108 void |
13434 | 1109 x_report_frame_params (f, alistptr) |
1110 struct frame *f; | |
1111 Lisp_Object *alistptr; | |
1112 { | |
1113 char buf[16]; | |
1114 Lisp_Object tem; | |
1115 | |
1116 /* Represent negative positions (off the top or left screen edge) | |
1117 in a way that Fmodify_frame_parameters will understand correctly. */ | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1118 XSETINT (tem, f->output_data.w32->left_pos); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1119 if (f->output_data.w32->left_pos >= 0) |
13434 | 1120 store_in_alist (alistptr, Qleft, tem); |
1121 else | |
1122 store_in_alist (alistptr, Qleft, Fcons (Qplus, Fcons (tem, Qnil))); | |
1123 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1124 XSETINT (tem, f->output_data.w32->top_pos); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1125 if (f->output_data.w32->top_pos >= 0) |
13434 | 1126 store_in_alist (alistptr, Qtop, tem); |
1127 else | |
1128 store_in_alist (alistptr, Qtop, Fcons (Qplus, Fcons (tem, Qnil))); | |
1129 | |
1130 store_in_alist (alistptr, Qborder_width, | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1131 make_number (f->output_data.w32->border_width)); |
13434 | 1132 store_in_alist (alistptr, Qinternal_border_width, |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1133 make_number (f->output_data.w32->internal_border_width)); |
41834
efe03af8f775
(x_report_frame_params): Return actual fringe widths.
Kim F. Storm <storm@cua.dk>
parents:
41732
diff
changeset
|
1134 store_in_alist (alistptr, Qleft_fringe, |
efe03af8f775
(x_report_frame_params): Return actual fringe widths.
Kim F. Storm <storm@cua.dk>
parents:
41732
diff
changeset
|
1135 make_number (f->output_data.w32->left_fringe_width)); |
efe03af8f775
(x_report_frame_params): Return actual fringe widths.
Kim F. Storm <storm@cua.dk>
parents:
41732
diff
changeset
|
1136 store_in_alist (alistptr, Qright_fringe, |
efe03af8f775
(x_report_frame_params): Return actual fringe widths.
Kim F. Storm <storm@cua.dk>
parents:
41732
diff
changeset
|
1137 make_number (f->output_data.w32->right_fringe_width)); |
42007
81966d7ace84
(x_report_frame_params): Makes the scroll-bar-width frame parameter have
Eli Zaretskii <eliz@gnu.org>
parents:
41834
diff
changeset
|
1138 store_in_alist (alistptr, Qscroll_bar_width, |
81966d7ace84
(x_report_frame_params): Makes the scroll-bar-width frame parameter have
Eli Zaretskii <eliz@gnu.org>
parents:
41834
diff
changeset
|
1139 make_number (FRAME_HAS_VERTICAL_SCROLL_BARS (f) |
81966d7ace84
(x_report_frame_params): Makes the scroll-bar-width frame parameter have
Eli Zaretskii <eliz@gnu.org>
parents:
41834
diff
changeset
|
1140 ? FRAME_SCROLL_BAR_PIXEL_WIDTH(f) |
81966d7ace84
(x_report_frame_params): Makes the scroll-bar-width frame parameter have
Eli Zaretskii <eliz@gnu.org>
parents:
41834
diff
changeset
|
1141 : 0)); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1142 sprintf (buf, "%ld", (long) FRAME_W32_WINDOW (f)); |
13434 | 1143 store_in_alist (alistptr, Qwindow_id, |
1144 build_string (buf)); | |
1145 store_in_alist (alistptr, Qicon_name, f->icon_name); | |
1146 FRAME_SAMPLE_VISIBILITY (f); | |
1147 store_in_alist (alistptr, Qvisibility, | |
1148 (FRAME_VISIBLE_P (f) ? Qt | |
1149 : FRAME_ICONIFIED_P (f) ? Qicon : Qnil)); | |
1150 store_in_alist (alistptr, Qdisplay, | |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
1151 XCAR (FRAME_W32_DISPLAY_INFO (f)->name_list_element)); |
13434 | 1152 } |
1153 | |
1154 | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1155 DEFUN ("w32-define-rgb-color", Fw32_define_rgb_color, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1156 Sw32_define_rgb_color, 4, 4, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1157 doc: /* Convert RGB numbers to a windows color reference and associate with NAME. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1158 This adds or updates a named color to w32-color-map, making it |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1159 available for use. The original entry's RGB ref is returned, or nil |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1160 if the entry is new. */) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1161 (red, green, blue, name) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1162 Lisp_Object red, green, blue, name; |
13434 | 1163 { |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1164 Lisp_Object rgb; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1165 Lisp_Object oldrgb = Qnil; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1166 Lisp_Object entry; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1167 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1168 CHECK_NUMBER (red); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1169 CHECK_NUMBER (green); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1170 CHECK_NUMBER (blue); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1171 CHECK_STRING (name); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1172 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1173 XSET (rgb, Lisp_Int, RGB(XUINT (red), XUINT (green), XUINT (blue))); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1174 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1175 BLOCK_INPUT; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1176 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1177 /* replace existing entry in w32-color-map or add new entry. */ |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1178 entry = Fassoc (name, Vw32_color_map); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1179 if (NILP (entry)) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1180 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1181 entry = Fcons (name, rgb); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1182 Vw32_color_map = Fcons (entry, Vw32_color_map); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1183 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1184 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1185 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1186 oldrgb = Fcdr (entry); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1187 Fsetcdr (entry, rgb); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1188 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1189 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1190 UNBLOCK_INPUT; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1191 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1192 return (oldrgb); |
13434 | 1193 } |
1194 | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1195 DEFUN ("w32-load-color-file", Fw32_load_color_file, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1196 Sw32_load_color_file, 1, 1, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1197 doc: /* Create an alist of color entries from an external file. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1198 Assign this value to w32-color-map to replace the existing color map. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1199 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1200 The file should define one named RGB color per line like so: |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1201 R G B name |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1202 where R,G,B are numbers between 0 and 255 and name is an arbitrary string. */) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1203 (filename) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1204 Lisp_Object filename; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1205 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1206 FILE *fp; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1207 Lisp_Object cmap = Qnil; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1208 Lisp_Object abspath; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1209 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1210 CHECK_STRING (filename); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1211 abspath = Fexpand_file_name (filename, Qnil); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1212 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1213 fp = fopen (SDATA (filename), "rt"); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1214 if (fp) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1215 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1216 char buf[512]; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1217 int red, green, blue; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1218 int num; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1219 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1220 BLOCK_INPUT; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1221 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1222 while (fgets (buf, sizeof (buf), fp) != NULL) { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1223 if (sscanf (buf, "%u %u %u %n", &red, &green, &blue, &num) == 3) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1224 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1225 char *name = buf + num; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1226 num = strlen (name) - 1; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1227 if (name[num] == '\n') |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1228 name[num] = 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1229 cmap = Fcons (Fcons (build_string (name), |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1230 make_number (RGB (red, green, blue))), |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1231 cmap); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1232 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1233 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1234 fclose (fp); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1235 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1236 UNBLOCK_INPUT; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1237 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1238 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1239 return cmap; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1240 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1241 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1242 /* The default colors for the w32 color map */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1243 typedef struct colormap_t |
13434 | 1244 { |
1245 char *name; | |
1246 COLORREF colorref; | |
1247 } colormap_t; | |
1248 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1249 colormap_t w32_color_map[] = |
13434 | 1250 { |
14983
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1251 {"snow" , PALETTERGB (255,250,250)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1252 {"ghost white" , PALETTERGB (248,248,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1253 {"GhostWhite" , PALETTERGB (248,248,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1254 {"white smoke" , PALETTERGB (245,245,245)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1255 {"WhiteSmoke" , PALETTERGB (245,245,245)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1256 {"gainsboro" , PALETTERGB (220,220,220)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1257 {"floral white" , PALETTERGB (255,250,240)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1258 {"FloralWhite" , PALETTERGB (255,250,240)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1259 {"old lace" , PALETTERGB (253,245,230)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1260 {"OldLace" , PALETTERGB (253,245,230)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1261 {"linen" , PALETTERGB (250,240,230)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1262 {"antique white" , PALETTERGB (250,235,215)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1263 {"AntiqueWhite" , PALETTERGB (250,235,215)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1264 {"papaya whip" , PALETTERGB (255,239,213)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1265 {"PapayaWhip" , PALETTERGB (255,239,213)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1266 {"blanched almond" , PALETTERGB (255,235,205)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1267 {"BlanchedAlmond" , PALETTERGB (255,235,205)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1268 {"bisque" , PALETTERGB (255,228,196)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1269 {"peach puff" , PALETTERGB (255,218,185)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1270 {"PeachPuff" , PALETTERGB (255,218,185)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1271 {"navajo white" , PALETTERGB (255,222,173)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1272 {"NavajoWhite" , PALETTERGB (255,222,173)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1273 {"moccasin" , PALETTERGB (255,228,181)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1274 {"cornsilk" , PALETTERGB (255,248,220)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1275 {"ivory" , PALETTERGB (255,255,240)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1276 {"lemon chiffon" , PALETTERGB (255,250,205)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1277 {"LemonChiffon" , PALETTERGB (255,250,205)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1278 {"seashell" , PALETTERGB (255,245,238)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1279 {"honeydew" , PALETTERGB (240,255,240)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1280 {"mint cream" , PALETTERGB (245,255,250)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1281 {"MintCream" , PALETTERGB (245,255,250)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1282 {"azure" , PALETTERGB (240,255,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1283 {"alice blue" , PALETTERGB (240,248,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1284 {"AliceBlue" , PALETTERGB (240,248,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1285 {"lavender" , PALETTERGB (230,230,250)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1286 {"lavender blush" , PALETTERGB (255,240,245)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1287 {"LavenderBlush" , PALETTERGB (255,240,245)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1288 {"misty rose" , PALETTERGB (255,228,225)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1289 {"MistyRose" , PALETTERGB (255,228,225)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1290 {"white" , PALETTERGB (255,255,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1291 {"black" , PALETTERGB ( 0, 0, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1292 {"dark slate gray" , PALETTERGB ( 47, 79, 79)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1293 {"DarkSlateGray" , PALETTERGB ( 47, 79, 79)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1294 {"dark slate grey" , PALETTERGB ( 47, 79, 79)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1295 {"DarkSlateGrey" , PALETTERGB ( 47, 79, 79)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1296 {"dim gray" , PALETTERGB (105,105,105)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1297 {"DimGray" , PALETTERGB (105,105,105)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1298 {"dim grey" , PALETTERGB (105,105,105)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1299 {"DimGrey" , PALETTERGB (105,105,105)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1300 {"slate gray" , PALETTERGB (112,128,144)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1301 {"SlateGray" , PALETTERGB (112,128,144)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1302 {"slate grey" , PALETTERGB (112,128,144)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1303 {"SlateGrey" , PALETTERGB (112,128,144)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1304 {"light slate gray" , PALETTERGB (119,136,153)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1305 {"LightSlateGray" , PALETTERGB (119,136,153)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1306 {"light slate grey" , PALETTERGB (119,136,153)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1307 {"LightSlateGrey" , PALETTERGB (119,136,153)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1308 {"gray" , PALETTERGB (190,190,190)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1309 {"grey" , PALETTERGB (190,190,190)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1310 {"light grey" , PALETTERGB (211,211,211)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1311 {"LightGrey" , PALETTERGB (211,211,211)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1312 {"light gray" , PALETTERGB (211,211,211)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1313 {"LightGray" , PALETTERGB (211,211,211)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1314 {"midnight blue" , PALETTERGB ( 25, 25,112)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1315 {"MidnightBlue" , PALETTERGB ( 25, 25,112)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1316 {"navy" , PALETTERGB ( 0, 0,128)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1317 {"navy blue" , PALETTERGB ( 0, 0,128)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1318 {"NavyBlue" , PALETTERGB ( 0, 0,128)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1319 {"cornflower blue" , PALETTERGB (100,149,237)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1320 {"CornflowerBlue" , PALETTERGB (100,149,237)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1321 {"dark slate blue" , PALETTERGB ( 72, 61,139)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1322 {"DarkSlateBlue" , PALETTERGB ( 72, 61,139)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1323 {"slate blue" , PALETTERGB (106, 90,205)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1324 {"SlateBlue" , PALETTERGB (106, 90,205)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1325 {"medium slate blue" , PALETTERGB (123,104,238)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1326 {"MediumSlateBlue" , PALETTERGB (123,104,238)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1327 {"light slate blue" , PALETTERGB (132,112,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1328 {"LightSlateBlue" , PALETTERGB (132,112,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1329 {"medium blue" , PALETTERGB ( 0, 0,205)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1330 {"MediumBlue" , PALETTERGB ( 0, 0,205)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1331 {"royal blue" , PALETTERGB ( 65,105,225)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1332 {"RoyalBlue" , PALETTERGB ( 65,105,225)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1333 {"blue" , PALETTERGB ( 0, 0,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1334 {"dodger blue" , PALETTERGB ( 30,144,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1335 {"DodgerBlue" , PALETTERGB ( 30,144,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1336 {"deep sky blue" , PALETTERGB ( 0,191,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1337 {"DeepSkyBlue" , PALETTERGB ( 0,191,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1338 {"sky blue" , PALETTERGB (135,206,235)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1339 {"SkyBlue" , PALETTERGB (135,206,235)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1340 {"light sky blue" , PALETTERGB (135,206,250)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1341 {"LightSkyBlue" , PALETTERGB (135,206,250)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1342 {"steel blue" , PALETTERGB ( 70,130,180)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1343 {"SteelBlue" , PALETTERGB ( 70,130,180)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1344 {"light steel blue" , PALETTERGB (176,196,222)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1345 {"LightSteelBlue" , PALETTERGB (176,196,222)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1346 {"light blue" , PALETTERGB (173,216,230)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1347 {"LightBlue" , PALETTERGB (173,216,230)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1348 {"powder blue" , PALETTERGB (176,224,230)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1349 {"PowderBlue" , PALETTERGB (176,224,230)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1350 {"pale turquoise" , PALETTERGB (175,238,238)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1351 {"PaleTurquoise" , PALETTERGB (175,238,238)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1352 {"dark turquoise" , PALETTERGB ( 0,206,209)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1353 {"DarkTurquoise" , PALETTERGB ( 0,206,209)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1354 {"medium turquoise" , PALETTERGB ( 72,209,204)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1355 {"MediumTurquoise" , PALETTERGB ( 72,209,204)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1356 {"turquoise" , PALETTERGB ( 64,224,208)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1357 {"cyan" , PALETTERGB ( 0,255,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1358 {"light cyan" , PALETTERGB (224,255,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1359 {"LightCyan" , PALETTERGB (224,255,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1360 {"cadet blue" , PALETTERGB ( 95,158,160)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1361 {"CadetBlue" , PALETTERGB ( 95,158,160)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1362 {"medium aquamarine" , PALETTERGB (102,205,170)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1363 {"MediumAquamarine" , PALETTERGB (102,205,170)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1364 {"aquamarine" , PALETTERGB (127,255,212)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1365 {"dark green" , PALETTERGB ( 0,100, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1366 {"DarkGreen" , PALETTERGB ( 0,100, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1367 {"dark olive green" , PALETTERGB ( 85,107, 47)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1368 {"DarkOliveGreen" , PALETTERGB ( 85,107, 47)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1369 {"dark sea green" , PALETTERGB (143,188,143)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1370 {"DarkSeaGreen" , PALETTERGB (143,188,143)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1371 {"sea green" , PALETTERGB ( 46,139, 87)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1372 {"SeaGreen" , PALETTERGB ( 46,139, 87)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1373 {"medium sea green" , PALETTERGB ( 60,179,113)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1374 {"MediumSeaGreen" , PALETTERGB ( 60,179,113)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1375 {"light sea green" , PALETTERGB ( 32,178,170)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1376 {"LightSeaGreen" , PALETTERGB ( 32,178,170)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1377 {"pale green" , PALETTERGB (152,251,152)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1378 {"PaleGreen" , PALETTERGB (152,251,152)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1379 {"spring green" , PALETTERGB ( 0,255,127)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1380 {"SpringGreen" , PALETTERGB ( 0,255,127)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1381 {"lawn green" , PALETTERGB (124,252, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1382 {"LawnGreen" , PALETTERGB (124,252, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1383 {"green" , PALETTERGB ( 0,255, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1384 {"chartreuse" , PALETTERGB (127,255, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1385 {"medium spring green" , PALETTERGB ( 0,250,154)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1386 {"MediumSpringGreen" , PALETTERGB ( 0,250,154)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1387 {"green yellow" , PALETTERGB (173,255, 47)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1388 {"GreenYellow" , PALETTERGB (173,255, 47)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1389 {"lime green" , PALETTERGB ( 50,205, 50)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1390 {"LimeGreen" , PALETTERGB ( 50,205, 50)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1391 {"yellow green" , PALETTERGB (154,205, 50)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1392 {"YellowGreen" , PALETTERGB (154,205, 50)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1393 {"forest green" , PALETTERGB ( 34,139, 34)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1394 {"ForestGreen" , PALETTERGB ( 34,139, 34)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1395 {"olive drab" , PALETTERGB (107,142, 35)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1396 {"OliveDrab" , PALETTERGB (107,142, 35)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1397 {"dark khaki" , PALETTERGB (189,183,107)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1398 {"DarkKhaki" , PALETTERGB (189,183,107)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1399 {"khaki" , PALETTERGB (240,230,140)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1400 {"pale goldenrod" , PALETTERGB (238,232,170)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1401 {"PaleGoldenrod" , PALETTERGB (238,232,170)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1402 {"light goldenrod yellow" , PALETTERGB (250,250,210)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1403 {"LightGoldenrodYellow" , PALETTERGB (250,250,210)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1404 {"light yellow" , PALETTERGB (255,255,224)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1405 {"LightYellow" , PALETTERGB (255,255,224)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1406 {"yellow" , PALETTERGB (255,255, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1407 {"gold" , PALETTERGB (255,215, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1408 {"light goldenrod" , PALETTERGB (238,221,130)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1409 {"LightGoldenrod" , PALETTERGB (238,221,130)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1410 {"goldenrod" , PALETTERGB (218,165, 32)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1411 {"dark goldenrod" , PALETTERGB (184,134, 11)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1412 {"DarkGoldenrod" , PALETTERGB (184,134, 11)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1413 {"rosy brown" , PALETTERGB (188,143,143)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1414 {"RosyBrown" , PALETTERGB (188,143,143)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1415 {"indian red" , PALETTERGB (205, 92, 92)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1416 {"IndianRed" , PALETTERGB (205, 92, 92)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1417 {"saddle brown" , PALETTERGB (139, 69, 19)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1418 {"SaddleBrown" , PALETTERGB (139, 69, 19)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1419 {"sienna" , PALETTERGB (160, 82, 45)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1420 {"peru" , PALETTERGB (205,133, 63)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1421 {"burlywood" , PALETTERGB (222,184,135)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1422 {"beige" , PALETTERGB (245,245,220)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1423 {"wheat" , PALETTERGB (245,222,179)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1424 {"sandy brown" , PALETTERGB (244,164, 96)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1425 {"SandyBrown" , PALETTERGB (244,164, 96)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1426 {"tan" , PALETTERGB (210,180,140)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1427 {"chocolate" , PALETTERGB (210,105, 30)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1428 {"firebrick" , PALETTERGB (178,34, 34)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1429 {"brown" , PALETTERGB (165,42, 42)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1430 {"dark salmon" , PALETTERGB (233,150,122)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1431 {"DarkSalmon" , PALETTERGB (233,150,122)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1432 {"salmon" , PALETTERGB (250,128,114)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1433 {"light salmon" , PALETTERGB (255,160,122)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1434 {"LightSalmon" , PALETTERGB (255,160,122)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1435 {"orange" , PALETTERGB (255,165, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1436 {"dark orange" , PALETTERGB (255,140, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1437 {"DarkOrange" , PALETTERGB (255,140, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1438 {"coral" , PALETTERGB (255,127, 80)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1439 {"light coral" , PALETTERGB (240,128,128)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1440 {"LightCoral" , PALETTERGB (240,128,128)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1441 {"tomato" , PALETTERGB (255, 99, 71)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1442 {"orange red" , PALETTERGB (255, 69, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1443 {"OrangeRed" , PALETTERGB (255, 69, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1444 {"red" , PALETTERGB (255, 0, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1445 {"hot pink" , PALETTERGB (255,105,180)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1446 {"HotPink" , PALETTERGB (255,105,180)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1447 {"deep pink" , PALETTERGB (255, 20,147)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1448 {"DeepPink" , PALETTERGB (255, 20,147)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1449 {"pink" , PALETTERGB (255,192,203)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1450 {"light pink" , PALETTERGB (255,182,193)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1451 {"LightPink" , PALETTERGB (255,182,193)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1452 {"pale violet red" , PALETTERGB (219,112,147)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1453 {"PaleVioletRed" , PALETTERGB (219,112,147)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1454 {"maroon" , PALETTERGB (176, 48, 96)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1455 {"medium violet red" , PALETTERGB (199, 21,133)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1456 {"MediumVioletRed" , PALETTERGB (199, 21,133)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1457 {"violet red" , PALETTERGB (208, 32,144)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1458 {"VioletRed" , PALETTERGB (208, 32,144)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1459 {"magenta" , PALETTERGB (255, 0,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1460 {"violet" , PALETTERGB (238,130,238)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1461 {"plum" , PALETTERGB (221,160,221)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1462 {"orchid" , PALETTERGB (218,112,214)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1463 {"medium orchid" , PALETTERGB (186, 85,211)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1464 {"MediumOrchid" , PALETTERGB (186, 85,211)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1465 {"dark orchid" , PALETTERGB (153, 50,204)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1466 {"DarkOrchid" , PALETTERGB (153, 50,204)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1467 {"dark violet" , PALETTERGB (148, 0,211)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1468 {"DarkViolet" , PALETTERGB (148, 0,211)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1469 {"blue violet" , PALETTERGB (138, 43,226)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1470 {"BlueViolet" , PALETTERGB (138, 43,226)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1471 {"purple" , PALETTERGB (160, 32,240)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1472 {"medium purple" , PALETTERGB (147,112,219)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1473 {"MediumPurple" , PALETTERGB (147,112,219)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1474 {"thistle" , PALETTERGB (216,191,216)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1475 {"gray0" , PALETTERGB ( 0, 0, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1476 {"grey0" , PALETTERGB ( 0, 0, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1477 {"dark grey" , PALETTERGB (169,169,169)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1478 {"DarkGrey" , PALETTERGB (169,169,169)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1479 {"dark gray" , PALETTERGB (169,169,169)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1480 {"DarkGray" , PALETTERGB (169,169,169)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1481 {"dark blue" , PALETTERGB ( 0, 0,139)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1482 {"DarkBlue" , PALETTERGB ( 0, 0,139)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1483 {"dark cyan" , PALETTERGB ( 0,139,139)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1484 {"DarkCyan" , PALETTERGB ( 0,139,139)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1485 {"dark magenta" , PALETTERGB (139, 0,139)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1486 {"DarkMagenta" , PALETTERGB (139, 0,139)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1487 {"dark red" , PALETTERGB (139, 0, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1488 {"DarkRed" , PALETTERGB (139, 0, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1489 {"light green" , PALETTERGB (144,238,144)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1490 {"LightGreen" , PALETTERGB (144,238,144)}, |
13434 | 1491 }; |
1492 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1493 DEFUN ("w32-default-color-map", Fw32_default_color_map, Sw32_default_color_map, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
1494 0, 0, 0, doc: /* Return the default color map. */) |
13434 | 1495 () |
1496 { | |
1497 int i; | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1498 colormap_t *pc = w32_color_map; |
13434 | 1499 Lisp_Object cmap; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1500 |
13434 | 1501 BLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1502 |
13434 | 1503 cmap = Qnil; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1504 |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1505 for (i = 0; i < sizeof (w32_color_map) / sizeof (w32_color_map[0]); |
13434 | 1506 pc++, i++) |
1507 cmap = Fcons (Fcons (build_string (pc->name), | |
1508 make_number (pc->colorref)), | |
1509 cmap); | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1510 |
13434 | 1511 UNBLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1512 |
13434 | 1513 return (cmap); |
1514 } | |
1515 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1516 Lisp_Object |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1517 w32_to_x_color (rgb) |
13434 | 1518 Lisp_Object rgb; |
1519 { | |
1520 Lisp_Object color; | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1521 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1522 CHECK_NUMBER (rgb); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1523 |
13434 | 1524 BLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1525 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1526 color = Frassq (rgb, Vw32_color_map); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1527 |
13434 | 1528 UNBLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1529 |
13434 | 1530 if (!NILP (color)) |
1531 return (Fcar (color)); | |
1532 else | |
1533 return Qnil; | |
1534 } | |
1535 | |
23314
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1536 COLORREF |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1537 w32_color_map_lookup (colorname) |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1538 char *colorname; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1539 { |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1540 Lisp_Object tail, ret = Qnil; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1541 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1542 BLOCK_INPUT; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1543 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1544 for (tail = Vw32_color_map; !NILP (tail); tail = Fcdr (tail)) |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1545 { |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1546 register Lisp_Object elt, tem; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1547 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1548 elt = Fcar (tail); |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1549 if (!CONSP (elt)) continue; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1550 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1551 tem = Fcar (elt); |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1552 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1553 if (lstrcmpi (SDATA (tem), colorname) == 0) |
23314
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1554 { |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1555 ret = XUINT (Fcdr (elt)); |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1556 break; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1557 } |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1558 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1559 QUIT; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1560 } |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1561 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1562 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1563 UNBLOCK_INPUT; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1564 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1565 return ret; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1566 } |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1567 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1568 COLORREF |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1569 x_to_w32_color (colorname) |
13434 | 1570 char * colorname; |
1571 { | |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
1572 register Lisp_Object ret = Qnil; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
1573 |
13434 | 1574 BLOCK_INPUT; |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1575 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1576 if (colorname[0] == '#') |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1577 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1578 /* Could be an old-style RGB Device specification. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1579 char *color; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1580 int size; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1581 color = colorname + 1; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1582 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1583 size = strlen(color); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1584 if (size == 3 || size == 6 || size == 9 || size == 12) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1585 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1586 UINT colorval; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1587 int i, pos; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1588 pos = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1589 size /= 3; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1590 colorval = 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1591 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1592 for (i = 0; i < 3; i++) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1593 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1594 char *end; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1595 char t; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1596 unsigned long value; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1597 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1598 /* The check for 'x' in the following conditional takes into |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1599 account the fact that strtol allows a "0x" in front of |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1600 our numbers, and we don't. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1601 if (!isxdigit(color[0]) || color[1] == 'x') |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1602 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1603 t = color[size]; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1604 color[size] = '\0'; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1605 value = strtoul(color, &end, 16); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1606 color[size] = t; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1607 if (errno == ERANGE || end - color != size) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1608 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1609 switch (size) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1610 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1611 case 1: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1612 value = value * 0x10; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1613 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1614 case 2: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1615 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1616 case 3: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1617 value /= 0x10; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1618 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1619 case 4: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1620 value /= 0x100; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1621 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1622 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1623 colorval |= (value << pos); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1624 pos += 0x8; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1625 if (i == 2) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1626 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1627 UNBLOCK_INPUT; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1628 return (colorval); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1629 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1630 color = end; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1631 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1632 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1633 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1634 else if (strnicmp(colorname, "rgb:", 4) == 0) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1635 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1636 char *color; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1637 UINT colorval; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1638 int i, pos; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1639 pos = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1640 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1641 colorval = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1642 color = colorname + 4; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1643 for (i = 0; i < 3; i++) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1644 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1645 char *end; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1646 unsigned long value; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1647 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1648 /* The check for 'x' in the following conditional takes into |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1649 account the fact that strtol allows a "0x" in front of |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1650 our numbers, and we don't. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1651 if (!isxdigit(color[0]) || color[1] == 'x') |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1652 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1653 value = strtoul(color, &end, 16); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1654 if (errno == ERANGE) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1655 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1656 switch (end - color) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1657 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1658 case 1: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1659 value = value * 0x10 + value; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1660 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1661 case 2: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1662 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1663 case 3: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1664 value /= 0x10; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1665 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1666 case 4: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1667 value /= 0x100; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1668 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1669 default: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1670 value = ULONG_MAX; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1671 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1672 if (value == ULONG_MAX) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1673 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1674 colorval |= (value << pos); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1675 pos += 0x8; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1676 if (i == 2) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1677 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1678 if (*end != '\0') |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1679 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1680 UNBLOCK_INPUT; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1681 return (colorval); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1682 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1683 if (*end != '/') |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1684 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1685 color = end + 1; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1686 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1687 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1688 else if (strnicmp(colorname, "rgbi:", 5) == 0) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1689 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1690 /* This is an RGB Intensity specification. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1691 char *color; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1692 UINT colorval; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1693 int i, pos; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1694 pos = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1695 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1696 colorval = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1697 color = colorname + 5; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1698 for (i = 0; i < 3; i++) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1699 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1700 char *end; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1701 double value; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1702 UINT val; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1703 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1704 value = strtod(color, &end); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1705 if (errno == ERANGE) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1706 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1707 if (value < 0.0 || value > 1.0) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1708 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1709 val = (UINT)(0x100 * value); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1710 /* We used 0x100 instead of 0xFF to give a continuous |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1711 range between 0.0 and 1.0 inclusive. The next statement |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1712 fixes the 1.0 case. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1713 if (val == 0x100) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1714 val = 0xFF; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1715 colorval |= (val << pos); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1716 pos += 0x8; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1717 if (i == 2) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1718 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1719 if (*end != '\0') |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1720 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1721 UNBLOCK_INPUT; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1722 return (colorval); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1723 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1724 if (*end != '/') |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1725 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1726 color = end + 1; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1727 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1728 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1729 /* I am not going to attempt to handle any of the CIE color schemes |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1730 or TekHVC, since I don't know the algorithms for conversion to |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1731 RGB. */ |
23314
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1732 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1733 /* If we fail to lookup the color name in w32_color_map, then check the |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1734 colorname to see if it can be crudely approximated: If the X color |
23314
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1735 ends in a number (e.g., "darkseagreen2"), strip the number and |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1736 return the result of looking up the base color name. */ |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1737 ret = w32_color_map_lookup (colorname); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1738 if (NILP (ret)) |
13434 | 1739 { |
23314
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1740 int len = strlen (colorname); |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1741 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1742 if (isdigit (colorname[len - 1])) |
13434 | 1743 { |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
1744 char *ptr, *approx = alloca (len + 1); |
23314
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1745 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1746 strcpy (approx, colorname); |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1747 ptr = &approx[len - 1]; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1748 while (ptr > approx && isdigit (*ptr)) |
23314
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1749 *ptr-- = '\0'; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1750 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1751 ret = w32_color_map_lookup (approx); |
13434 | 1752 } |
1753 } | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1754 |
13434 | 1755 UNBLOCK_INPUT; |
1756 return ret; | |
1757 } | |
1758 | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1759 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1760 void |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1761 w32_regenerate_palette (FRAME_PTR f) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1762 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1763 struct w32_palette_entry * list; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1764 LOGPALETTE * log_palette; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1765 HPALETTE new_palette; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1766 int i; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1767 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1768 /* don't bother trying to create palette if not supported */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1769 if (! FRAME_W32_DISPLAY_INFO (f)->has_palette) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1770 return; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1771 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1772 log_palette = (LOGPALETTE *) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1773 alloca (sizeof (LOGPALETTE) + |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1774 FRAME_W32_DISPLAY_INFO (f)->num_colors * sizeof (PALETTEENTRY)); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1775 log_palette->palVersion = 0x300; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1776 log_palette->palNumEntries = FRAME_W32_DISPLAY_INFO (f)->num_colors; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1777 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1778 list = FRAME_W32_DISPLAY_INFO (f)->color_list; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1779 for (i = 0; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1780 i < FRAME_W32_DISPLAY_INFO (f)->num_colors; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1781 i++, list = list->next) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1782 log_palette->palPalEntry[i] = list->entry; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1783 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1784 new_palette = CreatePalette (log_palette); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1785 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1786 enter_crit (); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1787 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1788 if (FRAME_W32_DISPLAY_INFO (f)->palette) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1789 DeleteObject (FRAME_W32_DISPLAY_INFO (f)->palette); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1790 FRAME_W32_DISPLAY_INFO (f)->palette = new_palette; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1791 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1792 /* Realize display palette and garbage all frames. */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1793 release_frame_dc (f, get_frame_dc (f)); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1794 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1795 leave_crit (); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1796 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1797 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1798 #define W32_COLOR(pe) RGB (pe.peRed, pe.peGreen, pe.peBlue) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1799 #define SET_W32_COLOR(pe, color) \ |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1800 do \ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1801 { \ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1802 pe.peRed = GetRValue (color); \ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1803 pe.peGreen = GetGValue (color); \ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1804 pe.peBlue = GetBValue (color); \ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1805 pe.peFlags = 0; \ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1806 } while (0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1807 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1808 #if 0 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1809 /* Keep these around in case we ever want to track color usage. */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1810 void |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1811 w32_map_color (FRAME_PTR f, COLORREF color) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1812 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1813 struct w32_palette_entry * list = FRAME_W32_DISPLAY_INFO (f)->color_list; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1814 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1815 if (NILP (Vw32_enable_palette)) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1816 return; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1817 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1818 /* check if color is already mapped */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1819 while (list) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1820 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1821 if (W32_COLOR (list->entry) == color) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1822 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1823 ++list->refcount; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1824 return; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1825 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1826 list = list->next; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1827 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1828 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1829 /* not already mapped, so add to list and recreate Windows palette */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1830 list = (struct w32_palette_entry *) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1831 xmalloc (sizeof (struct w32_palette_entry)); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1832 SET_W32_COLOR (list->entry, color); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1833 list->refcount = 1; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1834 list->next = FRAME_W32_DISPLAY_INFO (f)->color_list; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1835 FRAME_W32_DISPLAY_INFO (f)->color_list = list; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1836 FRAME_W32_DISPLAY_INFO (f)->num_colors++; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1837 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1838 /* set flag that palette must be regenerated */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1839 FRAME_W32_DISPLAY_INFO (f)->regen_palette = TRUE; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1840 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1841 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1842 void |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1843 w32_unmap_color (FRAME_PTR f, COLORREF color) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1844 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1845 struct w32_palette_entry * list = FRAME_W32_DISPLAY_INFO (f)->color_list; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1846 struct w32_palette_entry **prev = &FRAME_W32_DISPLAY_INFO (f)->color_list; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1847 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1848 if (NILP (Vw32_enable_palette)) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1849 return; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1850 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1851 /* check if color is already mapped */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1852 while (list) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1853 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1854 if (W32_COLOR (list->entry) == color) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1855 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1856 if (--list->refcount == 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1857 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1858 *prev = list->next; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1859 xfree (list); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1860 FRAME_W32_DISPLAY_INFO (f)->num_colors--; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1861 break; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1862 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1863 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1864 return; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1865 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1866 prev = &list->next; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1867 list = list->next; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1868 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1869 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1870 /* set flag that palette must be regenerated */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1871 FRAME_W32_DISPLAY_INFO (f)->regen_palette = TRUE; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1872 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1873 #endif |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1874 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1875 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1876 /* Gamma-correct COLOR on frame F. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1877 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1878 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1879 gamma_correct (f, color) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1880 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1881 COLORREF *color; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1882 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1883 if (f->gamma) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1884 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1885 *color = PALETTERGB ( |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1886 pow (GetRValue (*color) / 255.0, f->gamma) * 255.0 + 0.5, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1887 pow (GetGValue (*color) / 255.0, f->gamma) * 255.0 + 0.5, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1888 pow (GetBValue (*color) / 255.0, f->gamma) * 255.0 + 0.5); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1889 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1890 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1891 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1892 |
13434 | 1893 /* Decide if color named COLOR is valid for the display associated with |
1894 the selected frame; if so, return the rgb values in COLOR_DEF. | |
1895 If ALLOC is nonzero, allocate a new colormap cell. */ | |
1896 | |
1897 int | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1898 w32_defined_color (f, color, color_def, alloc) |
13434 | 1899 FRAME_PTR f; |
1900 char *color; | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1901 XColor *color_def; |
13434 | 1902 int alloc; |
1903 { | |
1904 register Lisp_Object tem; | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1905 COLORREF w32_color_ref; |
14353 | 1906 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1907 tem = x_to_w32_color (color); |
14353 | 1908 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1909 if (!NILP (tem)) |
13434 | 1910 { |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1911 if (f) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1912 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1913 /* Apply gamma correction. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1914 w32_color_ref = XUINT (tem); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1915 gamma_correct (f, &w32_color_ref); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1916 XSETINT (tem, w32_color_ref); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1917 } |
27407
7df920562cbe
(w32_defined_color): Apply gamma correction before trying to map to
Jason Rumney <jasonr@gnu.org>
parents:
27397
diff
changeset
|
1918 |
7df920562cbe
(w32_defined_color): Apply gamma correction before trying to map to
Jason Rumney <jasonr@gnu.org>
parents:
27397
diff
changeset
|
1919 /* Map this color to the palette if it is enabled. */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1920 if (!NILP (Vw32_enable_palette)) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1921 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1922 struct w32_palette_entry * entry = |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1923 one_w32_display_info.color_list; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1924 struct w32_palette_entry ** prev = |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1925 &one_w32_display_info.color_list; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1926 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1927 /* check if color is already mapped */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1928 while (entry) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1929 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1930 if (W32_COLOR (entry->entry) == XUINT (tem)) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1931 break; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1932 prev = &entry->next; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1933 entry = entry->next; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1934 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1935 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1936 if (entry == NULL && alloc) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1937 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1938 /* not already mapped, so add to list */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1939 entry = (struct w32_palette_entry *) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1940 xmalloc (sizeof (struct w32_palette_entry)); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1941 SET_W32_COLOR (entry->entry, XUINT (tem)); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1942 entry->next = NULL; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1943 *prev = entry; |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1944 one_w32_display_info.num_colors++; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1945 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1946 /* set flag that palette must be regenerated */ |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1947 one_w32_display_info.regen_palette = TRUE; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1948 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1949 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1950 /* Ensure COLORREF value is snapped to nearest color in (default) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1951 palette by simulating the PALETTERGB macro. This works whether |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1952 or not the display device has a palette. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1953 w32_color_ref = XUINT (tem) | 0x2000000; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1954 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1955 color_def->pixel = w32_color_ref; |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
1956 color_def->red = GetRValue (w32_color_ref) * 256; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
1957 color_def->green = GetGValue (w32_color_ref) * 256; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
1958 color_def->blue = GetBValue (w32_color_ref) * 256; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1959 |
13434 | 1960 return 1; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1961 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1962 else |
14353 | 1963 { |
1964 return 0; | |
1965 } | |
13434 | 1966 } |
1967 | |
1968 /* Given a string ARG naming a color, compute a pixel value from it | |
1969 suitable for screen F. | |
1970 If F is not a color screen, return DEF (default) regardless of what | |
1971 ARG says. */ | |
1972 | |
1973 int | |
1974 x_decode_color (f, arg, def) | |
1975 FRAME_PTR f; | |
1976 Lisp_Object arg; | |
1977 int def; | |
1978 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1979 XColor cdef; |
13434 | 1980 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1981 CHECK_STRING (arg); |
13434 | 1982 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1983 if (strcmp (SDATA (arg), "black") == 0) |
13434 | 1984 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:
46293
diff
changeset
|
1985 else if (strcmp (SDATA (arg), "white") == 0) |
13434 | 1986 return WHITE_PIX_DEFAULT (f); |
1987 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1988 if ((FRAME_W32_DISPLAY_INFO (f)->n_planes * FRAME_W32_DISPLAY_INFO (f)->n_cbits) == 1) |
13434 | 1989 return def; |
1990 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1991 /* w32_defined_color is responsible for coping with failures |
13434 | 1992 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:
46293
diff
changeset
|
1993 if (w32_defined_color (f, SDATA (arg), &cdef, 1)) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1994 return cdef.pixel; |
13434 | 1995 |
1996 /* defined_color failed; return an ultimate default. */ | |
1997 return def; | |
1998 } | |
1999 | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2000 /* Change the `line-spacing' frame parameter of frame F. OLD_VALUE is |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2001 the previous value of that parameter, NEW_VALUE is the new value. */ |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2002 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2003 static void |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2004 x_set_line_spacing (f, new_value, old_value) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2005 struct frame *f; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2006 Lisp_Object new_value, old_value; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2007 { |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2008 if (NILP (new_value)) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2009 f->extra_line_spacing = 0; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2010 else if (NATNUMP (new_value)) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2011 f->extra_line_spacing = XFASTINT (new_value); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2012 else |
30601
7c995a54a0e8
Replace `illegal' with `invalid'.
Gerd Moellmann <gerd@gnu.org>
parents:
30239
diff
changeset
|
2013 Fsignal (Qerror, Fcons (build_string ("Invalid line-spacing"), |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2014 Fcons (new_value, Qnil))); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2015 if (FRAME_VISIBLE_P (f)) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2016 redraw_frame (f); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2017 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2018 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2019 |
43398 | 2020 /* Change the `fullscreen' frame parameter of frame F. OLD_VALUE is |
2021 the previous value of that parameter, NEW_VALUE is the new value. */ | |
2022 | |
2023 static void | |
2024 x_set_fullscreen (f, new_value, old_value) | |
2025 struct frame *f; | |
2026 Lisp_Object new_value, old_value; | |
2027 { | |
2028 if (NILP (new_value)) | |
2029 f->output_data.w32->want_fullscreen = FULLSCREEN_NONE; | |
2030 else if (EQ (new_value, Qfullboth)) | |
2031 f->output_data.w32->want_fullscreen = FULLSCREEN_BOTH; | |
2032 else if (EQ (new_value, Qfullwidth)) | |
2033 f->output_data.w32->want_fullscreen = FULLSCREEN_WIDTH; | |
2034 else if (EQ (new_value, Qfullheight)) | |
2035 f->output_data.w32->want_fullscreen = FULLSCREEN_HEIGHT; | |
2036 } | |
2037 | |
2038 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2039 /* Change the `screen-gamma' frame parameter of frame F. OLD_VALUE is |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2040 the previous value of that parameter, NEW_VALUE is the new value. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2041 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2042 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2043 x_set_screen_gamma (f, new_value, old_value) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2044 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2045 Lisp_Object new_value, old_value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2046 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2047 if (NILP (new_value)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2048 f->gamma = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2049 else if (NUMBERP (new_value) && XFLOATINT (new_value) > 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2050 /* The value 0.4545 is the normal viewing gamma. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2051 f->gamma = 1.0 / (0.4545 * XFLOATINT (new_value)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2052 else |
30601
7c995a54a0e8
Replace `illegal' with `invalid'.
Gerd Moellmann <gerd@gnu.org>
parents:
30239
diff
changeset
|
2053 Fsignal (Qerror, Fcons (build_string ("Invalid screen-gamma"), |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2054 Fcons (new_value, Qnil))); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2055 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2056 clear_face_cache (0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2057 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2058 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2059 |
13434 | 2060 /* Functions called only from `x_set_frame_param' |
2061 to set individual parameters. | |
2062 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2063 If FRAME_W32_WINDOW (f) is 0, |
13434 | 2064 the frame is being created and its window does not exist yet. |
2065 In that case, just record the parameter's new value | |
2066 in the standard place; do not attempt to change the window. */ | |
2067 | |
2068 void | |
2069 x_set_foreground_color (f, arg, oldval) | |
2070 struct frame *f; | |
2071 Lisp_Object arg, oldval; | |
2072 { | |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2073 struct w32_output *x = f->output_data.w32; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2074 PIX_TYPE fg, old_fg; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2075 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2076 fg = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2077 old_fg = FRAME_FOREGROUND_PIXEL (f); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2078 FRAME_FOREGROUND_PIXEL (f) = fg; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2079 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2080 if (FRAME_W32_WINDOW (f) != 0) |
13434 | 2081 { |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2082 if (x->cursor_pixel == old_fg) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2083 x->cursor_pixel = fg; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2084 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2085 update_face_from_frame_parameter (f, Qforeground_color, arg); |
13434 | 2086 if (FRAME_VISIBLE_P (f)) |
2087 redraw_frame (f); | |
2088 } | |
2089 } | |
2090 | |
2091 void | |
2092 x_set_background_color (f, arg, oldval) | |
2093 struct frame *f; | |
2094 Lisp_Object arg, oldval; | |
2095 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2096 FRAME_BACKGROUND_PIXEL (f) |
13434 | 2097 = x_decode_color (f, arg, WHITE_PIX_DEFAULT (f)); |
2098 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2099 if (FRAME_W32_WINDOW (f) != 0) |
13434 | 2100 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2101 SetWindowLong (FRAME_W32_WINDOW (f), WND_BACKGROUND_INDEX, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2102 FRAME_BACKGROUND_PIXEL (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2103 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2104 update_face_from_frame_parameter (f, Qbackground_color, arg); |
13434 | 2105 |
2106 if (FRAME_VISIBLE_P (f)) | |
2107 redraw_frame (f); | |
2108 } | |
2109 } | |
2110 | |
2111 void | |
2112 x_set_mouse_color (f, arg, oldval) | |
2113 struct frame *f; | |
2114 Lisp_Object arg, oldval; | |
2115 { | |
2116 Cursor cursor, nontext_cursor, mode_cursor, cross_cursor; | |
17632
d2915156a803
(x_set_mouse_color): Update calls to x_catch_errors
Richard M. Stallman <rms@gnu.org>
parents:
16884
diff
changeset
|
2117 int count; |
13434 | 2118 int mask_color; |
2119 | |
2120 if (!EQ (Qnil, arg)) | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2121 f->output_data.w32->mouse_pixel |
13434 | 2122 = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2123 mask_color = FRAME_BACKGROUND_PIXEL (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2124 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2125 /* Don't let pointers be invisible. */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2126 if (mask_color == f->output_data.w32->mouse_pixel |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2127 && mask_color == FRAME_BACKGROUND_PIXEL (f)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2128 f->output_data.w32->mouse_pixel = FRAME_FOREGROUND_PIXEL (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2129 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
2130 #if 0 /* TODO : cursor changes */ |
13434 | 2131 BLOCK_INPUT; |
2132 | |
2133 /* It's not okay to crash if the user selects a screwy cursor. */ | |
17632
d2915156a803
(x_set_mouse_color): Update calls to x_catch_errors
Richard M. Stallman <rms@gnu.org>
parents:
16884
diff
changeset
|
2134 count = x_catch_errors (FRAME_W32_DISPLAY (f)); |
13434 | 2135 |
2136 if (!EQ (Qnil, Vx_pointer_shape)) | |
2137 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
2138 CHECK_NUMBER (Vx_pointer_shape); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2139 cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XINT (Vx_pointer_shape)); |
13434 | 2140 } |
2141 else | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2142 cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XC_xterm); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2143 x_check_errors (FRAME_W32_DISPLAY (f), "bad text pointer cursor: %s"); |
13434 | 2144 |
2145 if (!EQ (Qnil, Vx_nontext_pointer_shape)) | |
2146 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
2147 CHECK_NUMBER (Vx_nontext_pointer_shape); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2148 nontext_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), |
13434 | 2149 XINT (Vx_nontext_pointer_shape)); |
2150 } | |
2151 else | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2152 nontext_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XC_left_ptr); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2153 x_check_errors (FRAME_W32_DISPLAY (f), "bad nontext pointer cursor: %s"); |
13434 | 2154 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
2155 if (!EQ (Qnil, Vx_hourglass_pointer_shape)) |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
2156 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
2157 CHECK_NUMBER (Vx_hourglass_pointer_shape); |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
2158 hourglass_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
2159 XINT (Vx_hourglass_pointer_shape)); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
2160 } |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
2161 else |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
2162 hourglass_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XC_watch); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2163 x_check_errors (FRAME_W32_DISPLAY (f), "bad busy pointer cursor: %s"); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2164 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2165 x_check_errors (FRAME_W32_DISPLAY (f), "bad nontext pointer cursor: %s"); |
13434 | 2166 if (!EQ (Qnil, Vx_mode_pointer_shape)) |
2167 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
2168 CHECK_NUMBER (Vx_mode_pointer_shape); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2169 mode_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), |
13434 | 2170 XINT (Vx_mode_pointer_shape)); |
2171 } | |
2172 else | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2173 mode_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XC_xterm); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2174 x_check_errors (FRAME_W32_DISPLAY (f), "bad modeline pointer cursor: %s"); |
13434 | 2175 |
2176 if (!EQ (Qnil, Vx_sensitive_text_pointer_shape)) | |
2177 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
2178 CHECK_NUMBER (Vx_sensitive_text_pointer_shape); |
13434 | 2179 cross_cursor |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2180 = XCreateFontCursor (FRAME_W32_DISPLAY (f), |
13434 | 2181 XINT (Vx_sensitive_text_pointer_shape)); |
2182 } | |
2183 else | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2184 cross_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XC_crosshair); |
13434 | 2185 |
34133
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
2186 if (!NILP (Vx_window_horizontal_drag_shape)) |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
2187 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
2188 CHECK_NUMBER (Vx_window_horizontal_drag_shape); |
34133
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
2189 horizontal_drag_cursor |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
2190 = XCreateFontCursor (FRAME_X_DISPLAY (f), |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
2191 XINT (Vx_window_horizontal_drag_shape)); |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
2192 } |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
2193 else |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
2194 horizontal_drag_cursor |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
2195 = XCreateFontCursor (FRAME_X_DISPLAY (f), XC_sb_h_double_arrow); |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
2196 |
13434 | 2197 /* Check and report errors with the above calls. */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2198 x_check_errors (FRAME_W32_DISPLAY (f), "can't set cursor shape: %s"); |
17632
d2915156a803
(x_set_mouse_color): Update calls to x_catch_errors
Richard M. Stallman <rms@gnu.org>
parents:
16884
diff
changeset
|
2199 x_uncatch_errors (FRAME_W32_DISPLAY (f), count); |
13434 | 2200 |
2201 { | |
2202 XColor fore_color, back_color; | |
2203 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2204 fore_color.pixel = f->output_data.w32->mouse_pixel; |
13434 | 2205 back_color.pixel = mask_color; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2206 XQueryColor (FRAME_W32_DISPLAY (f), |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2207 DefaultColormap (FRAME_W32_DISPLAY (f), |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2208 DefaultScreen (FRAME_W32_DISPLAY (f))), |
13434 | 2209 &fore_color); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2210 XQueryColor (FRAME_W32_DISPLAY (f), |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2211 DefaultColormap (FRAME_W32_DISPLAY (f), |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2212 DefaultScreen (FRAME_W32_DISPLAY (f))), |
13434 | 2213 &back_color); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2214 XRecolorCursor (FRAME_W32_DISPLAY (f), cursor, |
13434 | 2215 &fore_color, &back_color); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2216 XRecolorCursor (FRAME_W32_DISPLAY (f), nontext_cursor, |
13434 | 2217 &fore_color, &back_color); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2218 XRecolorCursor (FRAME_W32_DISPLAY (f), mode_cursor, |
13434 | 2219 &fore_color, &back_color); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2220 XRecolorCursor (FRAME_W32_DISPLAY (f), cross_cursor, |
13434 | 2221 &fore_color, &back_color); |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
2222 XRecolorCursor (FRAME_W32_DISPLAY (f), hourglass_cursor, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2223 &fore_color, &back_color); |
13434 | 2224 } |
2225 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2226 if (FRAME_W32_WINDOW (f) != 0) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2227 XDefineCursor (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), cursor); |
13434 | 2228 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2229 if (cursor != f->output_data.w32->text_cursor && f->output_data.w32->text_cursor != 0) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2230 XFreeCursor (FRAME_W32_DISPLAY (f), f->output_data.w32->text_cursor); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2231 f->output_data.w32->text_cursor = cursor; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2232 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2233 if (nontext_cursor != f->output_data.w32->nontext_cursor |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2234 && f->output_data.w32->nontext_cursor != 0) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2235 XFreeCursor (FRAME_W32_DISPLAY (f), f->output_data.w32->nontext_cursor); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2236 f->output_data.w32->nontext_cursor = nontext_cursor; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2237 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
2238 if (hourglass_cursor != f->output_data.w32->hourglass_cursor |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
2239 && f->output_data.w32->hourglass_cursor != 0) |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
2240 XFreeCursor (FRAME_W32_DISPLAY (f), f->output_data.w32->hourglass_cursor); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
2241 f->output_data.w32->hourglass_cursor = hourglass_cursor; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2242 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2243 if (mode_cursor != f->output_data.w32->modeline_cursor |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2244 && f->output_data.w32->modeline_cursor != 0) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2245 XFreeCursor (FRAME_W32_DISPLAY (f), f->output_data.w32->modeline_cursor); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2246 f->output_data.w32->modeline_cursor = mode_cursor; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2247 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2248 if (cross_cursor != f->output_data.w32->cross_cursor |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2249 && f->output_data.w32->cross_cursor != 0) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2250 XFreeCursor (FRAME_W32_DISPLAY (f), f->output_data.w32->cross_cursor); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2251 f->output_data.w32->cross_cursor = cross_cursor; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2252 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2253 XFlush (FRAME_W32_DISPLAY (f)); |
13434 | 2254 UNBLOCK_INPUT; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2255 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2256 update_face_from_frame_parameter (f, Qmouse_color, arg); |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
2257 #endif /* TODO */ |
13434 | 2258 } |
2259 | |
34062
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
2260 /* Defined in w32term.c. */ |
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
2261 void x_update_cursor (struct frame *f, int on_p); |
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
2262 |
13434 | 2263 void |
2264 x_set_cursor_color (f, arg, oldval) | |
2265 struct frame *f; | |
2266 Lisp_Object arg, oldval; | |
2267 { | |
34062
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
2268 unsigned long fore_pixel, pixel; |
13434 | 2269 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2270 if (!NILP (Vx_cursor_fore_pixel)) |
13434 | 2271 fore_pixel = x_decode_color (f, Vx_cursor_fore_pixel, |
34062
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
2272 WHITE_PIX_DEFAULT (f)); |
13434 | 2273 else |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2274 fore_pixel = FRAME_BACKGROUND_PIXEL (f); |
34062
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
2275 |
34089 | 2276 pixel = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f)); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2277 |
13434 | 2278 /* Make sure that the cursor color differs from the background color. */ |
34062
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
2279 if (pixel == FRAME_BACKGROUND_PIXEL (f)) |
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
2280 { |
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
2281 pixel = f->output_data.w32->mouse_pixel; |
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
2282 if (pixel == fore_pixel) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2283 fore_pixel = FRAME_BACKGROUND_PIXEL (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2284 } |
34062
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
2285 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
2286 f->output_data.w32->cursor_foreground_pixel = fore_pixel; |
34062
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
2287 f->output_data.w32->cursor_pixel = pixel; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2288 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2289 if (FRAME_W32_WINDOW (f) != 0) |
13434 | 2290 { |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
2291 BLOCK_INPUT; |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
2292 /* Update frame's cursor_gc. */ |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
2293 f->output_data.w32->cursor_gc->foreground = fore_pixel; |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
2294 f->output_data.w32->cursor_gc->background = pixel; |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
2295 |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
2296 UNBLOCK_INPUT; |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
2297 |
13434 | 2298 if (FRAME_VISIBLE_P (f)) |
2299 { | |
34062
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
2300 x_update_cursor (f, 0); |
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
2301 x_update_cursor (f, 1); |
13434 | 2302 } |
2303 } | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2304 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2305 update_face_from_frame_parameter (f, Qcursor_color, arg); |
13434 | 2306 } |
2307 | |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2308 /* Set the border-color of frame F to pixel value PIX. |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2309 Note that this does not fully take effect if done before |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2310 F has a window. */ |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2311 void |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2312 x_set_border_pixel (f, pix) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2313 struct frame *f; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2314 int pix; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2315 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2316 f->output_data.w32->border_pixel = pix; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2317 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2318 if (FRAME_W32_WINDOW (f) != 0 && f->output_data.w32->border_width > 0) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2319 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2320 if (FRAME_VISIBLE_P (f)) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2321 redraw_frame (f); |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2322 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2323 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
2324 |
13434 | 2325 /* Set the border-color of frame F to value described by ARG. |
2326 ARG can be a string naming a color. | |
2327 The border-color is used for the border that is drawn by the server. | |
2328 Note that this does not fully take effect if done before | |
2329 F has a window; it must be redone when the window is created. */ | |
2330 | |
2331 void | |
2332 x_set_border_color (f, arg, oldval) | |
2333 struct frame *f; | |
2334 Lisp_Object arg, oldval; | |
2335 { | |
2336 int pix; | |
2337 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
2338 CHECK_STRING (arg); |
13434 | 2339 pix = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f)); |
2340 x_set_border_pixel (f, pix); | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2341 update_face_from_frame_parameter (f, Qborder_color, arg); |
13434 | 2342 } |
2343 | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2344 |
13434 | 2345 void |
2346 x_set_cursor_type (f, arg, oldval) | |
2347 FRAME_PTR f; | |
2348 Lisp_Object arg, oldval; | |
2349 { | |
47140
9ef4bf7492cb
(Vblink_cursor_alist): Removed.
Kim F. Storm <storm@cua.dk>
parents:
47097
diff
changeset
|
2350 set_frame_cursor_types (f, arg); |
13434 | 2351 |
2352 /* Make sure the cursor gets redrawn. This is overkill, but how | |
2353 often do people change cursor types? */ | |
2354 update_mode_lines++; | |
2355 } | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2356 |
13434 | 2357 void |
2358 x_set_icon_type (f, arg, oldval) | |
2359 struct frame *f; | |
2360 Lisp_Object arg, oldval; | |
2361 { | |
2362 int result; | |
2363 | |
25235
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
2364 if (NILP (arg) && NILP (oldval)) |
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
2365 return; |
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
2366 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2367 if (STRINGP (arg) && STRINGP (oldval) |
25235
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
2368 && EQ (Fstring_equal (oldval, arg), Qt)) |
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
2369 return; |
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
2370 |
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
2371 if (SYMBOLP (arg) && SYMBOLP (oldval) && EQ (arg, oldval)) |
13434 | 2372 return; |
2373 | |
2374 BLOCK_INPUT; | |
25235
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
2375 |
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
2376 result = x_bitmap_icon (f, arg); |
13434 | 2377 if (result) |
2378 { | |
2379 UNBLOCK_INPUT; | |
2380 error ("No icon window available"); | |
2381 } | |
2382 | |
2383 UNBLOCK_INPUT; | |
2384 } | |
2385 | |
2386 /* Return non-nil if frame F wants a bitmap icon. */ | |
2387 | |
2388 Lisp_Object | |
2389 x_icon_type (f) | |
2390 FRAME_PTR f; | |
2391 { | |
2392 Lisp_Object tem; | |
2393 | |
2394 tem = assq_no_quit (Qicon_type, f->param_alist); | |
2395 if (CONSP (tem)) | |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
2396 return XCDR (tem); |
13434 | 2397 else |
2398 return Qnil; | |
2399 } | |
2400 | |
2401 void | |
2402 x_set_icon_name (f, arg, oldval) | |
2403 struct frame *f; | |
2404 Lisp_Object arg, oldval; | |
2405 { | |
2406 if (STRINGP (arg)) | |
2407 { | |
2408 if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt)) | |
2409 return; | |
2410 } | |
2411 else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil)) | |
2412 return; | |
2413 | |
2414 f->icon_name = arg; | |
2415 | |
2416 #if 0 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2417 if (f->output_data.w32->icon_bitmap != 0) |
13434 | 2418 return; |
2419 | |
2420 BLOCK_INPUT; | |
2421 | |
2422 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:
46293
diff
changeset
|
2423 (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:
46293
diff
changeset
|
2424 ? f->icon_name |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2425 : !NILP (f->title) |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2426 ? f->title |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2427 : f->name))); |
13434 | 2428 |
2429 if (result) | |
2430 { | |
2431 UNBLOCK_INPUT; | |
2432 error ("No icon window available"); | |
2433 } | |
2434 | |
2435 /* If the window was unmapped (and its icon was mapped), | |
2436 the new icon is not mapped, so map the window in its stead. */ | |
2437 if (FRAME_VISIBLE_P (f)) | |
2438 { | |
2439 #ifdef USE_X_TOOLKIT | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2440 XtPopup (f->output_data.w32->widget, XtGrabNone); |
13434 | 2441 #endif |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2442 XMapWindow (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f)); |
13434 | 2443 } |
2444 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2445 XFlush (FRAME_W32_DISPLAY (f)); |
13434 | 2446 UNBLOCK_INPUT; |
2447 #endif | |
2448 } | |
2449 | |
2450 extern Lisp_Object x_new_font (); | |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
2451 extern Lisp_Object x_new_fontset(); |
13434 | 2452 |
2453 void | |
2454 x_set_font (f, arg, oldval) | |
2455 struct frame *f; | |
2456 Lisp_Object arg, oldval; | |
2457 { | |
2458 Lisp_Object result; | |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
2459 Lisp_Object fontset_name; |
22625
e7bd87148368
(Fx_list_fonts): Bring arglist into sync with xfns.c.
Richard M. Stallman <rms@gnu.org>
parents:
22078
diff
changeset
|
2460 Lisp_Object frame; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2461 int old_fontset = FRAME_FONTSET(f); |
13434 | 2462 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
2463 CHECK_STRING (arg); |
13434 | 2464 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
2465 fontset_name = Fquery_fontset (arg, Qnil); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
2466 |
13434 | 2467 BLOCK_INPUT; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
2468 result = (STRINGP (fontset_name) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2469 ? x_new_fontset (f, SDATA (fontset_name)) |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2470 : x_new_font (f, SDATA (arg))); |
13434 | 2471 UNBLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2472 |
13434 | 2473 if (EQ (result, Qnil)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2474 error ("Font `%s' is not defined", SDATA (arg)); |
13434 | 2475 else if (EQ (result, Qt)) |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2476 error ("The characters of the given font have varying widths"); |
13434 | 2477 else if (STRINGP (result)) |
2478 { | |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2479 if (STRINGP (fontset_name)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2480 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2481 /* Fontset names are built from ASCII font names, so the |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2482 names may be equal despite there was a change. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2483 if (old_fontset == FRAME_FONTSET (f)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2484 return; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2485 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2486 else if (!NILP (Fequal (result, oldval))) |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
2487 return; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2488 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2489 store_frame_param (f, Qfont, result); |
13434 | 2490 recompute_basic_faces (f); |
2491 } | |
2492 else | |
2493 abort (); | |
22625
e7bd87148368
(Fx_list_fonts): Bring arglist into sync with xfns.c.
Richard M. Stallman <rms@gnu.org>
parents:
22078
diff
changeset
|
2494 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2495 do_pending_window_change (0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2496 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2497 /* Don't call `face-set-after-frame-default' when faces haven't been |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2498 initialized yet. This is the case when called from |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2499 Fx_create_frame. In that case, the X widget or window doesn't |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2500 exist either, and we can end up in x_report_frame_params with a |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2501 null widget which gives a segfault. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2502 if (FRAME_FACE_CACHE (f)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2503 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2504 XSETFRAME (frame, f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2505 call1 (Qface_set_after_frame_default, frame); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2506 } |
13434 | 2507 } |
2508 | |
41726
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
2509 static void |
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
2510 x_set_fringe_width (f, new_value, old_value) |
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
2511 struct frame *f; |
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
2512 Lisp_Object new_value, old_value; |
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
2513 { |
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
2514 x_compute_fringe_widths (f, 1); |
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
2515 } |
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
2516 |
13434 | 2517 void |
2518 x_set_border_width (f, arg, oldval) | |
2519 struct frame *f; | |
2520 Lisp_Object arg, oldval; | |
2521 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
2522 CHECK_NUMBER (arg); |
13434 | 2523 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2524 if (XINT (arg) == f->output_data.w32->border_width) |
13434 | 2525 return; |
2526 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2527 if (FRAME_W32_WINDOW (f) != 0) |
13434 | 2528 error ("Cannot change the border width of a window"); |
2529 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2530 f->output_data.w32->border_width = XINT (arg); |
13434 | 2531 } |
2532 | |
2533 void | |
2534 x_set_internal_border_width (f, arg, oldval) | |
2535 struct frame *f; | |
2536 Lisp_Object arg, oldval; | |
2537 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2538 int old = f->output_data.w32->internal_border_width; |
13434 | 2539 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
2540 CHECK_NUMBER (arg); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2541 f->output_data.w32->internal_border_width = XINT (arg); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2542 if (f->output_data.w32->internal_border_width < 0) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2543 f->output_data.w32->internal_border_width = 0; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2544 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2545 if (f->output_data.w32->internal_border_width == old) |
13434 | 2546 return; |
2547 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2548 if (FRAME_W32_WINDOW (f) != 0) |
13434 | 2549 { |
2550 x_set_window_size (f, 0, f->width, f->height); | |
2551 SET_FRAME_GARBAGED (f); | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2552 do_pending_window_change (0); |
13434 | 2553 } |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
2554 else |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
2555 SET_FRAME_GARBAGED (f); |
13434 | 2556 } |
2557 | |
2558 void | |
2559 x_set_visibility (f, value, oldval) | |
2560 struct frame *f; | |
2561 Lisp_Object value, oldval; | |
2562 { | |
2563 Lisp_Object frame; | |
2564 XSETFRAME (frame, f); | |
2565 | |
2566 if (NILP (value)) | |
2567 Fmake_frame_invisible (frame, Qt); | |
2568 else if (EQ (value, Qicon)) | |
2569 Ficonify_frame (frame); | |
2570 else | |
2571 Fmake_frame_visible (frame); | |
2572 } | |
2573 | |
33870
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2574 |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2575 /* Change window heights in windows rooted in WINDOW by N lines. */ |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2576 |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2577 static void |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2578 x_change_window_heights (window, n) |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2579 Lisp_Object window; |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2580 int n; |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2581 { |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2582 struct window *w = XWINDOW (window); |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2583 |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2584 XSETFASTINT (w->top, XFASTINT (w->top) + n); |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2585 XSETFASTINT (w->height, XFASTINT (w->height) - n); |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2586 |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2587 if (INTEGERP (w->orig_top)) |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2588 XSETFASTINT (w->orig_top, XFASTINT (w->orig_top) + n); |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2589 if (INTEGERP (w->orig_height)) |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2590 XSETFASTINT (w->orig_height, XFASTINT (w->orig_height) - n); |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2591 |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2592 /* Handle just the top child in a vertical split. */ |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2593 if (!NILP (w->vchild)) |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2594 x_change_window_heights (w->vchild, n); |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2595 |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2596 /* Adjust all children in a horizontal split. */ |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2597 for (window = w->hchild; !NILP (window); window = w->next) |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2598 { |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2599 w = XWINDOW (window); |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2600 x_change_window_heights (window, n); |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2601 } |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2602 } |
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
2603 |
13434 | 2604 void |
2605 x_set_menu_bar_lines (f, value, oldval) | |
2606 struct frame *f; | |
2607 Lisp_Object value, oldval; | |
2608 { | |
2609 int nlines; | |
2610 int olines = FRAME_MENU_BAR_LINES (f); | |
2611 | |
2612 /* Right now, menu bars don't work properly in minibuf-only frames; | |
2613 most of the commands try to apply themselves to the minibuffer | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2614 frame itself, and get an error because you can't switch buffers |
13434 | 2615 in or split the minibuffer window. */ |
2616 if (FRAME_MINIBUF_ONLY_P (f)) | |
2617 return; | |
2618 | |
2619 if (INTEGERP (value)) | |
2620 nlines = XINT (value); | |
2621 else | |
2622 nlines = 0; | |
2623 | |
2624 FRAME_MENU_BAR_LINES (f) = 0; | |
2625 if (nlines) | |
2626 FRAME_EXTERNAL_MENU_BAR (f) = 1; | |
2627 else | |
2628 { | |
2629 if (FRAME_EXTERNAL_MENU_BAR (f) == 1) | |
2630 free_frame_menubar (f); | |
2631 FRAME_EXTERNAL_MENU_BAR (f) = 0; | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2632 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2633 /* Adjust the frame size so that the client (text) dimensions |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2634 remain the same. This depends on FRAME_EXTERNAL_MENU_BAR being |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2635 set correctly. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2636 x_set_window_size (f, 0, FRAME_WIDTH (f), FRAME_HEIGHT (f)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2637 do_pending_window_change (0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2638 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2639 adjust_glyphs (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2640 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2641 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2642 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2643 /* Set the number of lines used for the tool bar of frame F to VALUE. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2644 VALUE not an integer, or < 0 means set the lines to zero. OLDVAL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2645 is the old number of tool bar lines. This function changes the |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2646 height of all windows on frame F to match the new tool bar height. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2647 The frame's height doesn't change. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2648 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2649 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2650 x_set_tool_bar_lines (f, value, oldval) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2651 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2652 Lisp_Object value, oldval; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2653 { |
33865
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2654 int delta, nlines, root_height; |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2655 Lisp_Object root_window; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2656 |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
2657 /* Treat tool bars like menu bars. */ |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
2658 if (FRAME_MINIBUF_ONLY_P (f)) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
2659 return; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
2660 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2661 /* Use VALUE only if an integer >= 0. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2662 if (INTEGERP (value) && XINT (value) >= 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2663 nlines = XFASTINT (value); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2664 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2665 nlines = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2666 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2667 /* Make sure we redisplay all windows in this frame. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2668 ++windows_or_buffers_changed; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2669 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2670 delta = nlines - FRAME_TOOL_BAR_LINES (f); |
33865
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2671 |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2672 /* Don't resize the tool-bar to more than we have room for. */ |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2673 root_window = FRAME_ROOT_WINDOW (f); |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2674 root_height = XINT (XWINDOW (root_window)->height); |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2675 if (root_height - delta < 1) |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2676 { |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2677 delta = root_height - 1; |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2678 nlines = FRAME_TOOL_BAR_LINES (f) + delta; |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2679 } |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2680 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2681 FRAME_TOOL_BAR_LINES (f) = nlines; |
33865
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2682 x_change_window_heights (root_window, delta); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2683 adjust_glyphs (f); |
33865
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2684 |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2685 /* We also have to make sure that the internal border at the top of |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2686 the frame, below the menu bar or tool bar, is redrawn when the |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2687 tool bar disappears. This is so because the internal border is |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2688 below the tool bar if one is displayed, but is below the menu bar |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2689 if there isn't a tool bar. The tool bar draws into the area |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2690 below the menu bar. */ |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2691 if (FRAME_W32_WINDOW (f) && FRAME_TOOL_BAR_LINES (f) == 0) |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2692 { |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2693 updating_frame = f; |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2694 clear_frame (); |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2695 clear_current_matrices (f); |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2696 updating_frame = NULL; |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2697 } |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2698 |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2699 /* If the tool bar gets smaller, the internal border below it |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2700 has to be cleared. It was formerly part of the display |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2701 of the larger tool bar, and updating windows won't clear it. */ |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2702 if (delta < 0) |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2703 { |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2704 int height = FRAME_INTERNAL_BORDER_WIDTH (f); |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2705 int width = PIXEL_WIDTH (f); |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2706 int y = nlines * CANON_Y_UNIT (f); |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2707 |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2708 BLOCK_INPUT; |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2709 { |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2710 HDC hdc = get_frame_dc (f); |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2711 w32_clear_area (f, hdc, 0, y, width, height); |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2712 release_frame_dc (f, hdc); |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2713 } |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2714 UNBLOCK_INPUT; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2715 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2716 if (WINDOWP (f->tool_bar_window)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2717 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix); |
33865
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2718 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2719 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2720 |
13434 | 2721 |
2722 /* Change the name of frame F to NAME. If NAME is nil, set F's name to | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2723 w32_id_name. |
13434 | 2724 |
2725 If EXPLICIT is non-zero, that indicates that lisp code is setting the | |
2726 name; if NAME is a string, set F's name to NAME and set | |
2727 F->explicit_name; if NAME is Qnil, then clear F->explicit_name. | |
2728 | |
2729 If EXPLICIT is zero, that indicates that Emacs redisplay code is | |
2730 suggesting a new name, which lisp code should override; if | |
2731 F->explicit_name is set, ignore the new name; otherwise, set it. */ | |
2732 | |
2733 void | |
2734 x_set_name (f, name, explicit) | |
2735 struct frame *f; | |
2736 Lisp_Object name; | |
2737 int explicit; | |
2738 { | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2739 /* Make sure that requests from lisp code override requests from |
13434 | 2740 Emacs redisplay code. */ |
2741 if (explicit) | |
2742 { | |
2743 /* If we're switching from explicit to implicit, we had better | |
2744 update the mode lines and thereby update the title. */ | |
2745 if (f->explicit_name && NILP (name)) | |
2746 update_mode_lines = 1; | |
2747 | |
2748 f->explicit_name = ! NILP (name); | |
2749 } | |
2750 else if (f->explicit_name) | |
2751 return; | |
2752 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2753 /* If NAME is nil, set the name to the w32_id_name. */ |
13434 | 2754 if (NILP (name)) |
2755 { | |
2756 /* Check for no change needed in this very common case | |
2757 before we do any consing. */ | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2758 if (!strcmp (FRAME_W32_DISPLAY_INFO (f)->w32_id_name, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2759 SDATA (f->name))) |
13434 | 2760 return; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2761 name = build_string (FRAME_W32_DISPLAY_INFO (f)->w32_id_name); |
13434 | 2762 } |
2763 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
2764 CHECK_STRING (name); |
13434 | 2765 |
2766 /* Don't change the name if it's already NAME. */ | |
2767 if (! NILP (Fstring_equal (name, f->name))) | |
2768 return; | |
2769 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2770 f->name = name; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2771 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2772 /* For setting the frame title, the title parameter should override |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2773 the name parameter. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2774 if (! NILP (f->title)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2775 name = f->title; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2776 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2777 if (FRAME_W32_WINDOW (f)) |
13434 | 2778 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2779 if (STRING_MULTIBYTE (name)) |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2780 name = ENCODE_SYSTEM (name); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2781 |
13434 | 2782 BLOCK_INPUT; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2783 SetWindowText(FRAME_W32_WINDOW (f), SDATA (name)); |
13434 | 2784 UNBLOCK_INPUT; |
2785 } | |
2786 } | |
2787 | |
2788 /* This function should be called when the user's lisp code has | |
2789 specified a name for the frame; the name will override any set by the | |
2790 redisplay code. */ | |
2791 void | |
2792 x_explicitly_set_name (f, arg, oldval) | |
2793 FRAME_PTR f; | |
2794 Lisp_Object arg, oldval; | |
2795 { | |
2796 x_set_name (f, arg, 1); | |
2797 } | |
2798 | |
2799 /* This function should be called by Emacs redisplay code to set the | |
2800 name; names set this way will never override names set by the user's | |
2801 lisp code. */ | |
2802 void | |
2803 x_implicitly_set_name (f, arg, oldval) | |
2804 FRAME_PTR f; | |
2805 Lisp_Object arg, oldval; | |
2806 { | |
2807 x_set_name (f, arg, 0); | |
2808 } | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2809 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2810 /* Change the title of frame F to NAME. |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2811 If NAME is nil, use the frame name as the title. |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2812 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2813 If EXPLICIT is non-zero, that indicates that lisp code is setting the |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2814 name; if NAME is a string, set F's name to NAME and set |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2815 F->explicit_name; if NAME is Qnil, then clear F->explicit_name. |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2816 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2817 If EXPLICIT is zero, that indicates that Emacs redisplay code is |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2818 suggesting a new name, which lisp code should override; if |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2819 F->explicit_name is set, ignore the new name; otherwise, set it. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2820 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2821 void |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2822 x_set_title (f, name, old_name) |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2823 struct frame *f; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2824 Lisp_Object name, old_name; |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2825 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2826 /* Don't change the title if it's already NAME. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2827 if (EQ (name, f->title)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2828 return; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2829 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2830 update_mode_lines = 1; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2831 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2832 f->title = name; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2833 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2834 if (NILP (name)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2835 name = f->name; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2836 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2837 if (FRAME_W32_WINDOW (f)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2838 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2839 if (STRING_MULTIBYTE (name)) |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
2840 name = ENCODE_SYSTEM (name); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2841 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2842 BLOCK_INPUT; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2843 SetWindowText(FRAME_W32_WINDOW (f), SDATA (name)); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2844 UNBLOCK_INPUT; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2845 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2846 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2847 |
13434 | 2848 void |
2849 x_set_autoraise (f, arg, oldval) | |
2850 struct frame *f; | |
2851 Lisp_Object arg, oldval; | |
2852 { | |
2853 f->auto_raise = !EQ (Qnil, arg); | |
2854 } | |
2855 | |
2856 void | |
2857 x_set_autolower (f, arg, oldval) | |
2858 struct frame *f; | |
2859 Lisp_Object arg, oldval; | |
2860 { | |
2861 f->auto_lower = !EQ (Qnil, arg); | |
2862 } | |
2863 | |
2864 void | |
2865 x_set_unsplittable (f, arg, oldval) | |
2866 struct frame *f; | |
2867 Lisp_Object arg, oldval; | |
2868 { | |
2869 f->no_split = !NILP (arg); | |
2870 } | |
2871 | |
2872 void | |
2873 x_set_vertical_scroll_bars (f, arg, oldval) | |
2874 struct frame *f; | |
2875 Lisp_Object arg, oldval; | |
2876 { | |
16259
f54af1701a5f
(Qright): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16106
diff
changeset
|
2877 if ((EQ (arg, Qleft) && FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) |
f54af1701a5f
(Qright): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16106
diff
changeset
|
2878 || (EQ (arg, Qright) && FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)) |
f54af1701a5f
(Qright): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16106
diff
changeset
|
2879 || (NILP (arg) && FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
f54af1701a5f
(Qright): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16106
diff
changeset
|
2880 || (!NILP (arg) && ! FRAME_HAS_VERTICAL_SCROLL_BARS (f))) |
13434 | 2881 { |
16259
f54af1701a5f
(Qright): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16106
diff
changeset
|
2882 FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = NILP (arg) ? |
f54af1701a5f
(Qright): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16106
diff
changeset
|
2883 vertical_scroll_bar_none : |
21735
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
2884 /* Put scroll bars on the right by default, as is conventional |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
2885 on MS-Windows. */ |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
2886 EQ (Qleft, arg) |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2887 ? vertical_scroll_bar_left |
21735
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
2888 : vertical_scroll_bar_right; |
13434 | 2889 |
2890 /* We set this parameter before creating the window for the | |
2891 frame, so we can get the geometry right from the start. | |
2892 However, if the window hasn't been created yet, we shouldn't | |
2893 call x_set_window_size. */ | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2894 if (FRAME_W32_WINDOW (f)) |
13434 | 2895 x_set_window_size (f, 0, FRAME_WIDTH (f), FRAME_HEIGHT (f)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2896 do_pending_window_change (0); |
13434 | 2897 } |
2898 } | |
2899 | |
2900 void | |
2901 x_set_scroll_bar_width (f, arg, oldval) | |
2902 struct frame *f; | |
2903 Lisp_Object arg, oldval; | |
2904 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2905 int wid = FONT_WIDTH (f->output_data.w32->font); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2906 |
13434 | 2907 if (NILP (arg)) |
2908 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2909 FRAME_SCROLL_BAR_PIXEL_WIDTH (f) = GetSystemMetrics (SM_CXVSCROLL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2910 FRAME_SCROLL_BAR_COLS (f) = (FRAME_SCROLL_BAR_PIXEL_WIDTH (f) + |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2911 wid - 1) / wid; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2912 if (FRAME_W32_WINDOW (f)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2913 x_set_window_size (f, 0, FRAME_WIDTH (f), FRAME_HEIGHT (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2914 do_pending_window_change (0); |
13434 | 2915 } |
2916 else if (INTEGERP (arg) && XINT (arg) > 0 | |
2917 && XFASTINT (arg) != FRAME_SCROLL_BAR_PIXEL_WIDTH (f)) | |
2918 { | |
2919 FRAME_SCROLL_BAR_PIXEL_WIDTH (f) = XFASTINT (arg); | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2920 FRAME_SCROLL_BAR_COLS (f) = (FRAME_SCROLL_BAR_PIXEL_WIDTH (f) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2921 + wid-1) / wid; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2922 if (FRAME_W32_WINDOW (f)) |
13434 | 2923 x_set_window_size (f, 0, FRAME_WIDTH (f), FRAME_HEIGHT (f)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2924 do_pending_window_change (0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2925 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2926 change_frame_size (f, 0, FRAME_WIDTH (f), 0, 0, 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2927 XWINDOW (FRAME_SELECTED_WINDOW (f))->cursor.hpos = 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2928 XWINDOW (FRAME_SELECTED_WINDOW (f))->cursor.x = 0; |
13434 | 2929 } |
2930 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2931 /* Subroutines of creating a frame. */ |
13434 | 2932 |
2933 /* Make sure that Vx_resource_name is set to a reasonable value. | |
2934 Fix it up, or set it to `emacs' if it is too hopeless. */ | |
2935 | |
2936 static void | |
2937 validate_x_resource_name () | |
2938 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2939 int len = 0; |
13434 | 2940 /* Number of valid characters in the resource name. */ |
2941 int good_count = 0; | |
2942 /* Number of invalid characters in the resource name. */ | |
2943 int bad_count = 0; | |
2944 Lisp_Object new; | |
2945 int i; | |
2946 | |
2947 if (STRINGP (Vx_resource_name)) | |
2948 { | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2949 unsigned char *p = SDATA (Vx_resource_name); |
13434 | 2950 int i; |
2951 | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2952 len = SBYTES (Vx_resource_name); |
13434 | 2953 |
2954 /* Only letters, digits, - and _ are valid in resource names. | |
2955 Count the valid characters and count the invalid ones. */ | |
2956 for (i = 0; i < len; i++) | |
2957 { | |
2958 int c = p[i]; | |
2959 if (! ((c >= 'a' && c <= 'z') | |
2960 || (c >= 'A' && c <= 'Z') | |
2961 || (c >= '0' && c <= '9') | |
2962 || c == '-' || c == '_')) | |
2963 bad_count++; | |
2964 else | |
2965 good_count++; | |
2966 } | |
2967 } | |
2968 else | |
2969 /* Not a string => completely invalid. */ | |
2970 bad_count = 5, good_count = 0; | |
2971 | |
2972 /* If name is valid already, return. */ | |
2973 if (bad_count == 0) | |
2974 return; | |
2975 | |
2976 /* If name is entirely invalid, or nearly so, use `emacs'. */ | |
2977 if (good_count == 0 | |
2978 || (good_count == 1 && bad_count > 0)) | |
2979 { | |
2980 Vx_resource_name = build_string ("emacs"); | |
2981 return; | |
2982 } | |
2983 | |
2984 /* Name is partly valid. Copy it and replace the invalid characters | |
2985 with underscores. */ | |
2986 | |
2987 Vx_resource_name = new = Fcopy_sequence (Vx_resource_name); | |
2988 | |
2989 for (i = 0; i < len; i++) | |
2990 { | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
2991 int c = SREF (new, i); |
13434 | 2992 if (! ((c >= 'a' && c <= 'z') |
2993 || (c >= 'A' && c <= 'Z') | |
2994 || (c >= '0' && c <= '9') | |
2995 || c == '-' || c == '_')) | |
46433
ebc447bb0250
* w32fns.c (validate_x_resource_name): Use SSET.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
2996 SSET (new, i, '_'); |
13434 | 2997 } |
2998 } | |
2999 | |
3000 | |
3001 extern char *x_get_string_resource (); | |
3002 | |
3003 DEFUN ("x-get-resource", Fx_get_resource, Sx_get_resource, 2, 4, 0, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3004 doc: /* Return the value of ATTRIBUTE, of class CLASS, from the X defaults database. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3005 This uses `INSTANCE.ATTRIBUTE' as the key and `Emacs.CLASS' as the |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3006 class, where INSTANCE is the name under which Emacs was invoked, or |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3007 the name specified by the `-name' or `-rn' command-line arguments. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3008 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3009 The optional arguments COMPONENT and SUBCLASS add to the key and the |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3010 class, respectively. You must specify both of them or neither. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3011 If you specify them, the key is `INSTANCE.COMPONENT.ATTRIBUTE' |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3012 and the class is `Emacs.CLASS.SUBCLASS'. */) |
13434 | 3013 (attribute, class, component, subclass) |
3014 Lisp_Object attribute, class, component, subclass; | |
3015 { | |
3016 register char *value; | |
3017 char *name_key; | |
3018 char *class_key; | |
3019 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
3020 CHECK_STRING (attribute); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
3021 CHECK_STRING (class); |
13434 | 3022 |
3023 if (!NILP (component)) | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
3024 CHECK_STRING (component); |
13434 | 3025 if (!NILP (subclass)) |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
3026 CHECK_STRING (subclass); |
13434 | 3027 if (NILP (component) != NILP (subclass)) |
3028 error ("x-get-resource: must specify both COMPONENT and SUBCLASS or neither"); | |
3029 | |
3030 validate_x_resource_name (); | |
3031 | |
3032 /* Allocate space for the components, the dots which separate them, | |
3033 and the final '\0'. Make them big enough for the worst case. */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3034 name_key = (char *) alloca (SBYTES (Vx_resource_name) |
13434 | 3035 + (STRINGP (component) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3036 ? SBYTES (component) : 0) |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3037 + SBYTES (attribute) |
13434 | 3038 + 3); |
3039 | |
3040 class_key = (char *) alloca ((sizeof (EMACS_CLASS) - 1) | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3041 + SBYTES (class) |
13434 | 3042 + (STRINGP (subclass) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3043 ? SBYTES (subclass) : 0) |
13434 | 3044 + 3); |
3045 | |
3046 /* Start with emacs.FRAMENAME for the name (the specific one) | |
3047 and with `Emacs' for the class key (the general one). */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3048 strcpy (name_key, SDATA (Vx_resource_name)); |
13434 | 3049 strcpy (class_key, EMACS_CLASS); |
3050 | |
3051 strcat (class_key, "."); | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3052 strcat (class_key, SDATA (class)); |
13434 | 3053 |
3054 if (!NILP (component)) | |
3055 { | |
3056 strcat (class_key, "."); | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3057 strcat (class_key, SDATA (subclass)); |
13434 | 3058 |
3059 strcat (name_key, "."); | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3060 strcat (name_key, SDATA (component)); |
13434 | 3061 } |
3062 | |
3063 strcat (name_key, "."); | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3064 strcat (name_key, SDATA (attribute)); |
13434 | 3065 |
3066 value = x_get_string_resource (Qnil, | |
3067 name_key, class_key); | |
3068 | |
3069 if (value != (char *) 0) | |
3070 return build_string (value); | |
3071 else | |
3072 return Qnil; | |
3073 } | |
3074 | |
3075 /* Used when C code wants a resource value. */ | |
3076 | |
3077 char * | |
3078 x_get_resource_string (attribute, class) | |
3079 char *attribute, *class; | |
3080 { | |
3081 char *name_key; | |
3082 char *class_key; | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3083 struct frame *sf = SELECTED_FRAME (); |
13434 | 3084 |
3085 /* Allocate space for the components, the dots which separate them, | |
3086 and the final '\0'. */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3087 name_key = (char *) alloca (SBYTES (Vinvocation_name) |
13434 | 3088 + strlen (attribute) + 2); |
3089 class_key = (char *) alloca ((sizeof (EMACS_CLASS) - 1) | |
3090 + strlen (class) + 2); | |
3091 | |
3092 sprintf (name_key, "%s.%s", | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3093 SDATA (Vinvocation_name), |
13434 | 3094 attribute); |
3095 sprintf (class_key, "%s.%s", EMACS_CLASS, class); | |
3096 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3097 return x_get_string_resource (sf, name_key, class_key); |
13434 | 3098 } |
3099 | |
3100 /* Types we might convert a resource string into. */ | |
3101 enum resource_types | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3102 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3103 RES_TYPE_NUMBER, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3104 RES_TYPE_FLOAT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3105 RES_TYPE_BOOLEAN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3106 RES_TYPE_STRING, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3107 RES_TYPE_SYMBOL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3108 }; |
13434 | 3109 |
3110 /* Return the value of parameter PARAM. | |
3111 | |
3112 First search ALIST, then Vdefault_frame_alist, then the X defaults | |
3113 database, using ATTRIBUTE as the attribute name and CLASS as its class. | |
3114 | |
3115 Convert the resource to the type specified by desired_type. | |
3116 | |
3117 If no default is specified, return Qunbound. If you call | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3118 w32_get_arg, make sure you deal with Qunbound in a reasonable way, |
13434 | 3119 and don't let it get stored in any Lisp-visible variables! */ |
3120 | |
3121 static Lisp_Object | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3122 w32_get_arg (alist, param, attribute, class, type) |
13434 | 3123 Lisp_Object alist, param; |
3124 char *attribute; | |
3125 char *class; | |
3126 enum resource_types type; | |
3127 { | |
3128 register Lisp_Object tem; | |
3129 | |
3130 tem = Fassq (param, alist); | |
3131 if (EQ (tem, Qnil)) | |
3132 tem = Fassq (param, Vdefault_frame_alist); | |
3133 if (EQ (tem, Qnil)) | |
3134 { | |
3135 | |
3136 if (attribute) | |
3137 { | |
3138 tem = Fx_get_resource (build_string (attribute), | |
3139 build_string (class), | |
3140 Qnil, Qnil); | |
3141 | |
3142 if (NILP (tem)) | |
3143 return Qunbound; | |
3144 | |
3145 switch (type) | |
3146 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3147 case RES_TYPE_NUMBER: |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3148 return make_number (atoi (SDATA (tem))); |
13434 | 3149 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3150 case RES_TYPE_FLOAT: |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3151 return make_float (atof (SDATA (tem))); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3152 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3153 case RES_TYPE_BOOLEAN: |
13434 | 3154 tem = Fdowncase (tem); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3155 if (!strcmp (SDATA (tem), "on") |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3156 || !strcmp (SDATA (tem), "true")) |
13434 | 3157 return Qt; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3158 else |
13434 | 3159 return Qnil; |
3160 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3161 case RES_TYPE_STRING: |
13434 | 3162 return tem; |
3163 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3164 case RES_TYPE_SYMBOL: |
13434 | 3165 /* As a special case, we map the values `true' and `on' |
3166 to Qt, and `false' and `off' to Qnil. */ | |
3167 { | |
3168 Lisp_Object lower; | |
3169 lower = Fdowncase (tem); | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3170 if (!strcmp (SDATA (lower), "on") |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3171 || !strcmp (SDATA (lower), "true")) |
13434 | 3172 return Qt; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3173 else if (!strcmp (SDATA (lower), "off") |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3174 || !strcmp (SDATA (lower), "false")) |
13434 | 3175 return Qnil; |
3176 else | |
3177 return Fintern (tem, Qnil); | |
3178 } | |
3179 | |
3180 default: | |
3181 abort (); | |
3182 } | |
3183 } | |
3184 else | |
3185 return Qunbound; | |
3186 } | |
3187 return Fcdr (tem); | |
3188 } | |
3189 | |
3190 /* Record in frame F the specified or default value according to ALIST | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
3191 of the parameter named PROP (a Lisp symbol). |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
3192 If no value is specified for PROP, look for an X default for XPROP |
13434 | 3193 on the frame named NAME. |
3194 If that is not found either, use the value DEFLT. */ | |
3195 | |
3196 static Lisp_Object | |
3197 x_default_parameter (f, alist, prop, deflt, xprop, xclass, type) | |
3198 struct frame *f; | |
3199 Lisp_Object alist; | |
3200 Lisp_Object prop; | |
3201 Lisp_Object deflt; | |
3202 char *xprop; | |
3203 char *xclass; | |
3204 enum resource_types type; | |
3205 { | |
3206 Lisp_Object tem; | |
3207 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3208 tem = w32_get_arg (alist, prop, xprop, xclass, type); |
13434 | 3209 if (EQ (tem, Qunbound)) |
3210 tem = deflt; | |
3211 x_set_frame_parameters (f, Fcons (Fcons (prop, tem), Qnil)); | |
3212 return tem; | |
3213 } | |
3214 | |
3215 DEFUN ("x-parse-geometry", Fx_parse_geometry, Sx_parse_geometry, 1, 1, 0, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3216 doc: /* Parse an X-style geometry string STRING. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3217 Returns an alist of the form ((top . TOP), (left . LEFT) ... ). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3218 The properties returned may include `top', `left', `height', and `width'. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3219 The value of `left' or `top' may be an integer, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3220 or a list (+ N) meaning N pixels relative to top/left corner, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
3221 or a list (- N) meaning -N pixels relative to bottom/right corner. */) |
13434 | 3222 (string) |
3223 Lisp_Object string; | |
3224 { | |
3225 int geometry, x, y; | |
3226 unsigned int width, height; | |
3227 Lisp_Object result; | |
3228 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
3229 CHECK_STRING (string); |
13434 | 3230 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
3231 geometry = XParseGeometry ((char *) SDATA (string), |
13434 | 3232 &x, &y, &width, &height); |
3233 | |
3234 result = Qnil; | |
3235 if (geometry & XValue) | |
3236 { | |
3237 Lisp_Object element; | |
3238 | |
3239 if (x >= 0 && (geometry & XNegative)) | |
3240 element = Fcons (Qleft, Fcons (Qminus, Fcons (make_number (-x), Qnil))); | |
3241 else if (x < 0 && ! (geometry & XNegative)) | |
3242 element = Fcons (Qleft, Fcons (Qplus, Fcons (make_number (x), Qnil))); | |
3243 else | |
3244 element = Fcons (Qleft, make_number (x)); | |
3245 result = Fcons (element, result); | |
3246 } | |
3247 | |
3248 if (geometry & YValue) | |
3249 { | |
3250 Lisp_Object element; | |
3251 | |
3252 if (y >= 0 && (geometry & YNegative)) | |
3253 element = Fcons (Qtop, Fcons (Qminus, Fcons (make_number (-y), Qnil))); | |
3254 else if (y < 0 && ! (geometry & YNegative)) | |
3255 element = Fcons (Qtop, Fcons (Qplus, Fcons (make_number (y), Qnil))); | |
3256 else | |
3257 element = Fcons (Qtop, make_number (y)); | |
3258 result = Fcons (element, result); | |
3259 } | |
3260 | |
3261 if (geometry & WidthValue) | |
3262 result = Fcons (Fcons (Qwidth, make_number (width)), result); | |
3263 if (geometry & HeightValue) | |
3264 result = Fcons (Fcons (Qheight, make_number (height)), result); | |
3265 | |
3266 return result; | |
3267 } | |
3268 | |
3269 /* Calculate the desired size and position of this window, | |
3270 and return the flags saying which aspects were specified. | |
3271 | |
3272 This function does not make the coordinates positive. */ | |
3273 | |
3274 #define DEFAULT_ROWS 40 | |
3275 #define DEFAULT_COLS 80 | |
3276 | |
3277 static int | |
3278 x_figure_window_size (f, parms) | |
3279 struct frame *f; | |
3280 Lisp_Object parms; | |
3281 { | |
3282 register Lisp_Object tem0, tem1, tem2; | |
3283 long window_prompting = 0; | |
3284 | |
3285 /* Default values if we fall through. | |
3286 Actually, if that happens we should get | |
3287 window manager prompting. */ | |
16259
f54af1701a5f
(Qright): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16106
diff
changeset
|
3288 SET_FRAME_WIDTH (f, DEFAULT_COLS); |
13434 | 3289 f->height = DEFAULT_ROWS; |
3290 /* Window managers expect that if program-specified | |
3291 positions are not (0,0), they're intentional, not defaults. */ | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3292 f->output_data.w32->top_pos = 0; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3293 f->output_data.w32->left_pos = 0; |
13434 | 3294 |
34942
af688bd6c419
(x_figure_window_size): Do not allow new_height and
Jason Rumney <jasonr@gnu.org>
parents:
34729
diff
changeset
|
3295 /* Ensure that old new_width and new_height will not override the |
af688bd6c419
(x_figure_window_size): Do not allow new_height and
Jason Rumney <jasonr@gnu.org>
parents:
34729
diff
changeset
|
3296 values set here. */ |
af688bd6c419
(x_figure_window_size): Do not allow new_height and
Jason Rumney <jasonr@gnu.org>
parents:
34729
diff
changeset
|
3297 FRAME_NEW_WIDTH (f) = 0; |
af688bd6c419
(x_figure_window_size): Do not allow new_height and
Jason Rumney <jasonr@gnu.org>
parents:
34729
diff
changeset
|
3298 FRAME_NEW_HEIGHT (f) = 0; |
af688bd6c419
(x_figure_window_size): Do not allow new_height and
Jason Rumney <jasonr@gnu.org>
parents:
34729
diff
changeset
|
3299 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3300 tem0 = w32_get_arg (parms, Qheight, 0, 0, RES_TYPE_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3301 tem1 = w32_get_arg (parms, Qwidth, 0, 0, RES_TYPE_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3302 tem2 = w32_get_arg (parms, Quser_size, 0, 0, RES_TYPE_NUMBER); |
13434 | 3303 if (! EQ (tem0, Qunbound) || ! EQ (tem1, Qunbound)) |
3304 { | |
3305 if (!EQ (tem0, Qunbound)) | |
3306 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
3307 CHECK_NUMBER (tem0); |
13434 | 3308 f->height = XINT (tem0); |
3309 } | |
3310 if (!EQ (tem1, Qunbound)) | |
3311 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
3312 CHECK_NUMBER (tem1); |
16259
f54af1701a5f
(Qright): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16106
diff
changeset
|
3313 SET_FRAME_WIDTH (f, XINT (tem1)); |
13434 | 3314 } |
3315 if (!NILP (tem2) && !EQ (tem2, Qunbound)) | |
3316 window_prompting |= USSize; | |
3317 else | |
3318 window_prompting |= PSize; | |
3319 } | |
3320 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3321 f->output_data.w32->vertical_scroll_bar_extra |
13434 | 3322 = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f) |
3323 ? 0 | |
3324 : FRAME_SCROLL_BAR_PIXEL_WIDTH (f) > 0 | |
3325 ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f) | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3326 : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.w32->font))); |
43398 | 3327 |
41726
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
3328 x_compute_fringe_widths (f, 0); |
43398 | 3329 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3330 f->output_data.w32->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3331 f->output_data.w32->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height); |
13434 | 3332 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3333 tem0 = w32_get_arg (parms, Qtop, 0, 0, RES_TYPE_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3334 tem1 = w32_get_arg (parms, Qleft, 0, 0, RES_TYPE_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3335 tem2 = w32_get_arg (parms, Quser_position, 0, 0, RES_TYPE_NUMBER); |
13434 | 3336 if (! EQ (tem0, Qunbound) || ! EQ (tem1, Qunbound)) |
3337 { | |
3338 if (EQ (tem0, Qminus)) | |
3339 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3340 f->output_data.w32->top_pos = 0; |
13434 | 3341 window_prompting |= YNegative; |
3342 } | |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3343 else if (CONSP (tem0) && EQ (XCAR (tem0), Qminus) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3344 && CONSP (XCDR (tem0)) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3345 && INTEGERP (XCAR (XCDR (tem0)))) |
13434 | 3346 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3347 f->output_data.w32->top_pos = - XINT (XCAR (XCDR (tem0))); |
13434 | 3348 window_prompting |= YNegative; |
3349 } | |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3350 else if (CONSP (tem0) && EQ (XCAR (tem0), Qplus) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3351 && CONSP (XCDR (tem0)) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3352 && INTEGERP (XCAR (XCDR (tem0)))) |
13434 | 3353 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3354 f->output_data.w32->top_pos = XINT (XCAR (XCDR (tem0))); |
13434 | 3355 } |
3356 else if (EQ (tem0, Qunbound)) | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3357 f->output_data.w32->top_pos = 0; |
13434 | 3358 else |
3359 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
3360 CHECK_NUMBER (tem0); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3361 f->output_data.w32->top_pos = XINT (tem0); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3362 if (f->output_data.w32->top_pos < 0) |
13434 | 3363 window_prompting |= YNegative; |
3364 } | |
3365 | |
3366 if (EQ (tem1, Qminus)) | |
3367 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3368 f->output_data.w32->left_pos = 0; |
13434 | 3369 window_prompting |= XNegative; |
3370 } | |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3371 else if (CONSP (tem1) && EQ (XCAR (tem1), Qminus) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3372 && CONSP (XCDR (tem1)) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3373 && INTEGERP (XCAR (XCDR (tem1)))) |
13434 | 3374 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3375 f->output_data.w32->left_pos = - XINT (XCAR (XCDR (tem1))); |
13434 | 3376 window_prompting |= XNegative; |
3377 } | |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3378 else if (CONSP (tem1) && EQ (XCAR (tem1), Qplus) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3379 && CONSP (XCDR (tem1)) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3380 && INTEGERP (XCAR (XCDR (tem1)))) |
13434 | 3381 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
3382 f->output_data.w32->left_pos = XINT (XCAR (XCDR (tem1))); |
13434 | 3383 } |
3384 else if (EQ (tem1, Qunbound)) | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3385 f->output_data.w32->left_pos = 0; |
13434 | 3386 else |
3387 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
3388 CHECK_NUMBER (tem1); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3389 f->output_data.w32->left_pos = XINT (tem1); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3390 if (f->output_data.w32->left_pos < 0) |
13434 | 3391 window_prompting |= XNegative; |
3392 } | |
3393 | |
3394 if (!NILP (tem2) && ! EQ (tem2, Qunbound)) | |
3395 window_prompting |= USPosition; | |
3396 else | |
3397 window_prompting |= PPosition; | |
3398 } | |
3399 | |
43398 | 3400 if (f->output_data.w32->want_fullscreen != FULLSCREEN_NONE) |
3401 { | |
3402 int left, top; | |
3403 int width, height; | |
3404 | |
3405 /* It takes both for some WM:s to place it where we want */ | |
3406 window_prompting = USPosition | PPosition; | |
3407 x_fullscreen_adjust (f, &width, &height, &top, &left); | |
3408 f->width = width; | |
3409 f->height = height; | |
3410 f->output_data.w32->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width); | |
3411 f->output_data.w32->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height); | |
3412 f->output_data.w32->left_pos = left; | |
3413 f->output_data.w32->top_pos = top; | |
3414 } | |
3415 | |
13434 | 3416 return window_prompting; |
3417 } | |
3418 | |
3419 | |
3420 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3421 extern LRESULT CALLBACK w32_wnd_proc (); |
13434 | 3422 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3423 BOOL |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3424 w32_init_class (hinst) |
13434 | 3425 HINSTANCE hinst; |
3426 { | |
3427 WNDCLASS wc; | |
3428 | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3429 wc.style = CS_HREDRAW | CS_VREDRAW; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3430 wc.lpfnWndProc = (WNDPROC) w32_wnd_proc; |
13434 | 3431 wc.cbClsExtra = 0; |
3432 wc.cbWndExtra = WND_EXTRA_BYTES; | |
3433 wc.hInstance = hinst; | |
3434 wc.hIcon = LoadIcon (hinst, EMACS_CLASS); | |
3435 wc.hCursor = LoadCursor (NULL, IDC_ARROW); | |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
3436 wc.hbrBackground = NULL; /* GetStockObject (WHITE_BRUSH); */ |
13434 | 3437 wc.lpszMenuName = NULL; |
3438 wc.lpszClassName = EMACS_CLASS; | |
3439 | |
3440 return (RegisterClass (&wc)); | |
3441 } | |
3442 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3443 HWND |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3444 w32_createscrollbar (f, bar) |
13434 | 3445 struct frame *f; |
3446 struct scroll_bar * bar; | |
3447 { | |
3448 return (CreateWindow ("SCROLLBAR", "", SBS_VERT | WS_CHILD | WS_VISIBLE, | |
3449 /* Position and size of scroll bar. */ | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3450 XINT(bar->left) + VERTICAL_SCROLL_BAR_WIDTH_TRIM, |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3451 XINT(bar->top), |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3452 XINT(bar->width) - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3453 XINT(bar->height), |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3454 FRAME_W32_WINDOW (f), |
13434 | 3455 NULL, |
3456 hinst, | |
3457 NULL)); | |
3458 } | |
3459 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3460 void |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3461 w32_createwindow (f) |
13434 | 3462 struct frame *f; |
3463 { | |
3464 HWND hwnd; | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3465 RECT rect; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3466 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3467 rect.left = rect.top = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3468 rect.right = PIXEL_WIDTH (f); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3469 rect.bottom = PIXEL_HEIGHT (f); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3470 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3471 AdjustWindowRect (&rect, f->output_data.w32->dwStyle, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3472 FRAME_EXTERNAL_MENU_BAR (f)); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3473 |
13434 | 3474 /* Do first time app init */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3475 |
13434 | 3476 if (!hprevinst) |
3477 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3478 w32_init_class (hinst); |
13434 | 3479 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3480 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3481 FRAME_W32_WINDOW (f) = hwnd |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3482 = CreateWindow (EMACS_CLASS, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3483 f->namebuf, |
39137
2d2b989f4a4b
(w32_createwindow): Undo last change.
Andrew Innes <andrewi@gnu.org>
parents:
39128
diff
changeset
|
3484 f->output_data.w32->dwStyle | WS_CLIPCHILDREN, |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3485 f->output_data.w32->left_pos, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3486 f->output_data.w32->top_pos, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3487 rect.right - rect.left, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3488 rect.bottom - rect.top, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3489 NULL, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3490 NULL, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3491 hinst, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3492 NULL); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3493 |
13434 | 3494 if (hwnd) |
3495 { | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3496 SetWindowLong (hwnd, WND_FONTWIDTH_INDEX, FONT_WIDTH (f->output_data.w32->font)); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3497 SetWindowLong (hwnd, WND_LINEHEIGHT_INDEX, f->output_data.w32->line_height); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3498 SetWindowLong (hwnd, WND_BORDER_INDEX, f->output_data.w32->internal_border_width); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3499 SetWindowLong (hwnd, WND_SCROLLBAR_INDEX, f->output_data.w32->vertical_scroll_bar_extra); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
3500 SetWindowLong (hwnd, WND_BACKGROUND_INDEX, FRAME_BACKGROUND_PIXEL (f)); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3501 |
21884 | 3502 /* Enable drag-n-drop. */ |
3503 DragAcceptFiles (hwnd, TRUE); | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3504 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3505 /* Do this to discard the default setting specified by our parent. */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3506 ShowWindow (hwnd, SW_HIDE); |
13434 | 3507 } |
3508 } | |
3509 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3510 void |
13434 | 3511 my_post_msg (wmsg, hwnd, msg, wParam, lParam) |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3512 W32Msg * wmsg; |
13434 | 3513 HWND hwnd; |
3514 UINT msg; | |
3515 WPARAM wParam; | |
3516 LPARAM lParam; | |
3517 { | |
3518 wmsg->msg.hwnd = hwnd; | |
3519 wmsg->msg.message = msg; | |
3520 wmsg->msg.wParam = wParam; | |
3521 wmsg->msg.lParam = lParam; | |
3522 wmsg->msg.time = GetMessageTime (); | |
3523 | |
3524 post_msg (wmsg); | |
3525 } | |
3526 | |
16884
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16602
diff
changeset
|
3527 /* GetKeyState and MapVirtualKey on Windows 95 do not actually distinguish |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3528 between left and right keys as advertised. We test for this |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3529 support dynamically, and set a flag when the support is absent. If |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3530 absent, we keep track of the left and right control and alt keys |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3531 ourselves. This is particularly necessary on keyboards that rely |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3532 upon the AltGr key, which is represented as having the left control |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3533 and right alt keys pressed. For these keyboards, we need to know |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3534 when the left alt key has been pressed in addition to the AltGr key |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3535 so that we can properly support M-AltGr-key sequences (such as M-@ |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3536 on Swedish keyboards). */ |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3537 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3538 #define EMACS_LCONTROL 0 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3539 #define EMACS_RCONTROL 1 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3540 #define EMACS_LMENU 2 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3541 #define EMACS_RMENU 3 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3542 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3543 static int modifiers[4]; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3544 static int modifiers_recorded; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3545 static int modifier_key_support_tested; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3546 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3547 static void |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3548 test_modifier_support (unsigned int wparam) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3549 { |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3550 unsigned int l, r; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3551 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3552 if (wparam != VK_CONTROL && wparam != VK_MENU) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3553 return; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3554 if (wparam == VK_CONTROL) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3555 { |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3556 l = VK_LCONTROL; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3557 r = VK_RCONTROL; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3558 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3559 else |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3560 { |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3561 l = VK_LMENU; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3562 r = VK_RMENU; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3563 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3564 if (!(GetKeyState (l) & 0x8000) && !(GetKeyState (r) & 0x8000)) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3565 modifiers_recorded = 1; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3566 else |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3567 modifiers_recorded = 0; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3568 modifier_key_support_tested = 1; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3569 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3570 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3571 static void |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3572 record_keydown (unsigned int wparam, unsigned int lparam) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3573 { |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3574 int i; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3575 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3576 if (!modifier_key_support_tested) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3577 test_modifier_support (wparam); |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3578 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3579 if ((wparam != VK_CONTROL && wparam != VK_MENU) || !modifiers_recorded) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3580 return; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3581 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3582 if (wparam == VK_CONTROL) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3583 i = (lparam & 0x1000000) ? EMACS_RCONTROL : EMACS_LCONTROL; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3584 else |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3585 i = (lparam & 0x1000000) ? EMACS_RMENU : EMACS_LMENU; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3586 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3587 modifiers[i] = 1; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3588 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3589 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3590 static void |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3591 record_keyup (unsigned int wparam, unsigned int lparam) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3592 { |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3593 int i; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3594 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3595 if ((wparam != VK_CONTROL && wparam != VK_MENU) || !modifiers_recorded) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3596 return; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3597 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3598 if (wparam == VK_CONTROL) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3599 i = (lparam & 0x1000000) ? EMACS_RCONTROL : EMACS_LCONTROL; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3600 else |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3601 i = (lparam & 0x1000000) ? EMACS_RMENU : EMACS_LMENU; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3602 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3603 modifiers[i] = 0; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3604 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3605 |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
3606 /* Emacs can lose focus while a modifier key has been pressed. When |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3607 it regains focus, be conservative and clear all modifiers since |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
3608 we cannot reconstruct the left and right modifier state. */ |
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
3609 static void |
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
3610 reset_modifiers () |
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
3611 { |
15314
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
3612 SHORT ctrl, alt; |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
3613 |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3614 if (GetFocus () == NULL) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3615 /* Emacs doesn't have keyboard focus. Do nothing. */ |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
3616 return; |
15314
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
3617 |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
3618 ctrl = GetAsyncKeyState (VK_CONTROL); |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
3619 alt = GetAsyncKeyState (VK_MENU); |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
3620 |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
3621 if (!(ctrl & 0x08000)) |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
3622 /* Clear any recorded control modifier state. */ |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
3623 modifiers[EMACS_RCONTROL] = modifiers[EMACS_LCONTROL] = 0; |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
3624 |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
3625 if (!(alt & 0x08000)) |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
3626 /* Clear any recorded alt modifier state. */ |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
3627 modifiers[EMACS_RMENU] = modifiers[EMACS_LMENU] = 0; |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
3628 |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3629 /* Update the state of all modifier keys, because modifiers used in |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3630 hot-key combinations can get stuck on if Emacs loses focus as a |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3631 result of a hot-key being pressed. */ |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3632 { |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3633 BYTE keystate[256]; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3634 |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3635 #define CURRENT_STATE(key) ((GetAsyncKeyState (key) & 0x8000) >> 8) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3636 |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3637 GetKeyboardState (keystate); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3638 keystate[VK_SHIFT] = CURRENT_STATE (VK_SHIFT); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3639 keystate[VK_CONTROL] = CURRENT_STATE (VK_CONTROL); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3640 keystate[VK_LCONTROL] = CURRENT_STATE (VK_LCONTROL); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3641 keystate[VK_RCONTROL] = CURRENT_STATE (VK_RCONTROL); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3642 keystate[VK_MENU] = CURRENT_STATE (VK_MENU); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3643 keystate[VK_LMENU] = CURRENT_STATE (VK_LMENU); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3644 keystate[VK_RMENU] = CURRENT_STATE (VK_RMENU); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3645 keystate[VK_LWIN] = CURRENT_STATE (VK_LWIN); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3646 keystate[VK_RWIN] = CURRENT_STATE (VK_RWIN); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3647 keystate[VK_APPS] = CURRENT_STATE (VK_APPS); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3648 SetKeyboardState (keystate); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3649 } |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
3650 } |
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
3651 |
15377
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3652 /* Synchronize modifier state with what is reported with the current |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3653 keystroke. Even if we cannot distinguish between left and right |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3654 modifier keys, we know that, if no modifiers are set, then neither |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3655 the left or right modifier should be set. */ |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3656 static void |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3657 sync_modifiers () |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3658 { |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3659 if (!modifiers_recorded) |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3660 return; |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3661 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3662 if (!(GetKeyState (VK_CONTROL) & 0x8000)) |
15377
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3663 modifiers[EMACS_RCONTROL] = modifiers[EMACS_LCONTROL] = 0; |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3664 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3665 if (!(GetKeyState (VK_MENU) & 0x8000)) |
15377
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3666 modifiers[EMACS_RMENU] = modifiers[EMACS_LMENU] = 0; |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3667 } |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3668 |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3669 static int |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3670 modifier_set (int vkey) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3671 { |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3672 if (vkey == VK_CAPITAL || vkey == VK_SCROLL) |
15280
f39684fddaff
(modifier_set): Check toggle state of CapsLock even
Karl Heuer <kwzh@gnu.org>
parents:
15232
diff
changeset
|
3673 return (GetKeyState (vkey) & 0x1); |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3674 if (!modifiers_recorded) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3675 return (GetKeyState (vkey) & 0x8000); |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3676 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3677 switch (vkey) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3678 { |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3679 case VK_LCONTROL: |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3680 return modifiers[EMACS_LCONTROL]; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3681 case VK_RCONTROL: |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3682 return modifiers[EMACS_RCONTROL]; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3683 case VK_LMENU: |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3684 return modifiers[EMACS_LMENU]; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3685 case VK_RMENU: |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3686 return modifiers[EMACS_RMENU]; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3687 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3688 return (GetKeyState (vkey) & 0x8000); |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3689 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3690 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3691 /* Convert between the modifier bits W32 uses and the modifier bits |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3692 Emacs uses. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3693 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3694 unsigned int |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3695 w32_key_to_modifier (int key) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3696 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3697 Lisp_Object key_mapping; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3698 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3699 switch (key) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3700 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3701 case VK_LWIN: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3702 key_mapping = Vw32_lwindow_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3703 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3704 case VK_RWIN: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3705 key_mapping = Vw32_rwindow_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3706 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3707 case VK_APPS: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3708 key_mapping = Vw32_apps_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3709 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3710 case VK_SCROLL: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3711 key_mapping = Vw32_scroll_lock_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3712 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3713 default: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3714 key_mapping = Qnil; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3715 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3716 |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3717 /* NB. This code runs in the input thread, asychronously to the lisp |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3718 thread, so we must be careful to ensure access to lisp data is |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3719 thread-safe. The following code is safe because the modifier |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3720 variable values are updated atomically from lisp and symbols are |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3721 not relocated by GC. Also, we don't have to worry about seeing GC |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3722 markbits here. */ |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3723 if (EQ (key_mapping, Qhyper)) |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3724 return hyper_modifier; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3725 if (EQ (key_mapping, Qsuper)) |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3726 return super_modifier; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3727 if (EQ (key_mapping, Qmeta)) |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3728 return meta_modifier; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3729 if (EQ (key_mapping, Qalt)) |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3730 return alt_modifier; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3731 if (EQ (key_mapping, Qctrl)) |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3732 return ctrl_modifier; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3733 if (EQ (key_mapping, Qcontrol)) /* synonym for ctrl */ |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3734 return ctrl_modifier; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3735 if (EQ (key_mapping, Qshift)) |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3736 return shift_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3737 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3738 /* Don't generate any modifier if not explicitly requested. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3739 return 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3740 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3741 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3742 unsigned int |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3743 w32_get_modifiers () |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3744 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3745 return ((modifier_set (VK_SHIFT) ? shift_modifier : 0) | |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3746 (modifier_set (VK_CONTROL) ? ctrl_modifier : 0) | |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3747 (modifier_set (VK_LWIN) ? w32_key_to_modifier (VK_LWIN) : 0) | |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3748 (modifier_set (VK_RWIN) ? w32_key_to_modifier (VK_RWIN) : 0) | |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3749 (modifier_set (VK_APPS) ? w32_key_to_modifier (VK_APPS) : 0) | |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3750 (modifier_set (VK_SCROLL) ? w32_key_to_modifier (VK_SCROLL) : 0) | |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3751 (modifier_set (VK_MENU) ? |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3752 ((NILP (Vw32_alt_is_meta)) ? alt_modifier : meta_modifier) : 0)); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3753 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3754 |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3755 /* We map the VK_* modifiers into console modifier constants |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3756 so that we can use the same routines to handle both console |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3757 and window input. */ |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3758 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3759 static int |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3760 construct_console_modifiers () |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3761 { |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3762 int mods; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3763 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3764 mods = 0; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3765 mods |= (modifier_set (VK_SHIFT)) ? SHIFT_PRESSED : 0; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3766 mods |= (modifier_set (VK_CAPITAL)) ? CAPSLOCK_ON : 0; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3767 mods |= (modifier_set (VK_SCROLL)) ? SCROLLLOCK_ON : 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3768 mods |= (modifier_set (VK_NUMLOCK)) ? NUMLOCK_ON : 0; |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3769 mods |= (modifier_set (VK_LCONTROL)) ? LEFT_CTRL_PRESSED : 0; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3770 mods |= (modifier_set (VK_RCONTROL)) ? RIGHT_CTRL_PRESSED : 0; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3771 mods |= (modifier_set (VK_LMENU)) ? LEFT_ALT_PRESSED : 0; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3772 mods |= (modifier_set (VK_RMENU)) ? RIGHT_ALT_PRESSED : 0; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3773 mods |= (modifier_set (VK_LWIN)) ? LEFT_WIN_PRESSED : 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3774 mods |= (modifier_set (VK_RWIN)) ? RIGHT_WIN_PRESSED : 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3775 mods |= (modifier_set (VK_APPS)) ? APPS_PRESSED : 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3776 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3777 return mods; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3778 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3779 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3780 static int |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3781 w32_get_key_modifiers (unsigned int wparam, unsigned int lparam) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3782 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3783 int mods; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3784 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3785 /* Convert to emacs modifiers. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3786 mods = w32_kbd_mods_to_emacs (construct_console_modifiers (), wparam); |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3787 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3788 return mods; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3789 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3790 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3791 unsigned int |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3792 map_keypad_keys (unsigned int virt_key, unsigned int extended) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3793 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3794 if (virt_key < VK_CLEAR || virt_key > VK_DELETE) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3795 return virt_key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3796 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3797 if (virt_key == VK_RETURN) |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
3798 return (extended ? VK_NUMPAD_ENTER : VK_RETURN); |
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
3799 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3800 if (virt_key >= VK_PRIOR && virt_key <= VK_DOWN) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3801 return (!extended ? (VK_NUMPAD_PRIOR + (virt_key - VK_PRIOR)) : virt_key); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3802 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3803 if (virt_key == VK_INSERT || virt_key == VK_DELETE) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3804 return (!extended ? (VK_NUMPAD_INSERT + (virt_key - VK_INSERT)) : virt_key); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3805 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3806 if (virt_key == VK_CLEAR) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3807 return (!extended ? VK_NUMPAD_CLEAR : virt_key); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3808 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3809 return virt_key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3810 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3811 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3812 /* List of special key combinations which w32 would normally capture, |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3813 but emacs should grab instead. Not directly visible to lisp, to |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3814 simplify synchronization. Each item is an integer encoding a virtual |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3815 key code and modifier combination to capture. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3816 Lisp_Object w32_grabbed_keys; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3817 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3818 #define HOTKEY(vk,mods) make_number (((vk) & 255) | ((mods) << 8)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3819 #define HOTKEY_ID(k) (XFASTINT (k) & 0xbfff) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3820 #define HOTKEY_VK_CODE(k) (XFASTINT (k) & 255) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3821 #define HOTKEY_MODIFIERS(k) (XFASTINT (k) >> 8) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3822 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3823 /* Register hot-keys for reserved key combinations when Emacs has |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3824 keyboard focus, since this is the only way Emacs can receive key |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3825 combinations like Alt-Tab which are used by the system. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3826 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3827 static void |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3828 register_hot_keys (hwnd) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3829 HWND hwnd; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3830 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3831 Lisp_Object keylist; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3832 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3833 /* Use GC_CONSP, since we are called asynchronously. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3834 for (keylist = w32_grabbed_keys; GC_CONSP (keylist); keylist = XCDR (keylist)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3835 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3836 Lisp_Object key = XCAR (keylist); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3837 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3838 /* Deleted entries get set to nil. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3839 if (!INTEGERP (key)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3840 continue; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3841 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3842 RegisterHotKey (hwnd, HOTKEY_ID (key), |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3843 HOTKEY_MODIFIERS (key), HOTKEY_VK_CODE (key)); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3844 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3845 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3846 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3847 static void |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3848 unregister_hot_keys (hwnd) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3849 HWND hwnd; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3850 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3851 Lisp_Object keylist; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3852 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3853 /* Use GC_CONSP, since we are called asynchronously. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3854 for (keylist = w32_grabbed_keys; GC_CONSP (keylist); keylist = XCDR (keylist)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3855 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3856 Lisp_Object key = XCAR (keylist); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3857 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3858 if (!INTEGERP (key)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3859 continue; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3860 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3861 UnregisterHotKey (hwnd, HOTKEY_ID (key)); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3862 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3863 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3864 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3865 /* Main message dispatch loop. */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3866 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3867 static void |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3868 w32_msg_pump (deferred_msg * msg_buf) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3869 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3870 MSG msg; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3871 int result; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3872 HWND focus_window; |
21874
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
3873 |
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
3874 msh_mousewheel = RegisterWindowMessage (MSH_MOUSEWHEEL); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3875 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3876 while (GetMessage (&msg, NULL, 0, 0)) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3877 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3878 if (msg.hwnd == NULL) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3879 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3880 switch (msg.message) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3881 { |
23950
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
3882 case WM_NULL: |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
3883 /* Produced by complete_deferred_msg; just ignore. */ |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
3884 break; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3885 case WM_EMACS_CREATEWINDOW: |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3886 w32_createwindow ((struct frame *) msg.wParam); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3887 if (!PostThreadMessage (dwMainThreadId, WM_EMACS_DONE, 0, 0)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3888 abort (); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3889 break; |
21608
d191a8737145
(w32_msg_pump): Handle WM_EMACS_SETLOCALE.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19707
diff
changeset
|
3890 case WM_EMACS_SETLOCALE: |
d191a8737145
(w32_msg_pump): Handle WM_EMACS_SETLOCALE.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19707
diff
changeset
|
3891 SetThreadLocale (msg.wParam); |
d191a8737145
(w32_msg_pump): Handle WM_EMACS_SETLOCALE.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19707
diff
changeset
|
3892 /* Reply is not expected. */ |
d191a8737145
(w32_msg_pump): Handle WM_EMACS_SETLOCALE.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19707
diff
changeset
|
3893 break; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3894 case WM_EMACS_SETKEYBOARDLAYOUT: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3895 result = (int) ActivateKeyboardLayout ((HKL) msg.wParam, 0); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3896 if (!PostThreadMessage (dwMainThreadId, WM_EMACS_DONE, |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3897 result, 0)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3898 abort (); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3899 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3900 case WM_EMACS_REGISTER_HOT_KEY: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3901 focus_window = GetFocus (); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3902 if (focus_window != NULL) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3903 RegisterHotKey (focus_window, |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3904 HOTKEY_ID (msg.wParam), |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3905 HOTKEY_MODIFIERS (msg.wParam), |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3906 HOTKEY_VK_CODE (msg.wParam)); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3907 /* Reply is not expected. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3908 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3909 case WM_EMACS_UNREGISTER_HOT_KEY: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3910 focus_window = GetFocus (); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3911 if (focus_window != NULL) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3912 UnregisterHotKey (focus_window, HOTKEY_ID (msg.wParam)); |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3913 /* Mark item as erased. NB: this code must be |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3914 thread-safe. The next line is okay because the cons |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3915 cell is never made into garbage and is not relocated by |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3916 GC. */ |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39812
diff
changeset
|
3917 XSETCAR ((Lisp_Object) msg.lParam, Qnil); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3918 if (!PostThreadMessage (dwMainThreadId, WM_EMACS_DONE, 0, 0)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3919 abort (); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3920 break; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3921 case WM_EMACS_TOGGLE_LOCK_KEY: |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3922 { |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3923 int vk_code = (int) msg.wParam; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3924 int cur_state = (GetKeyState (vk_code) & 1); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3925 Lisp_Object new_state = (Lisp_Object) msg.lParam; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3926 |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3927 /* NB: This code must be thread-safe. It is safe to |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3928 call NILP because symbols are not relocated by GC, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3929 and pointer here is not touched by GC (so the markbit |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3930 can't be set). Numbers are safe because they are |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3931 immediate values. */ |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3932 if (NILP (new_state) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3933 || (NUMBERP (new_state) |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
3934 && ((XUINT (new_state)) & 1) != cur_state)) |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3935 { |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3936 one_w32_display_info.faked_key = vk_code; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3937 |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3938 keybd_event ((BYTE) vk_code, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3939 (BYTE) MapVirtualKey (vk_code, 0), |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3940 KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3941 keybd_event ((BYTE) vk_code, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3942 (BYTE) MapVirtualKey (vk_code, 0), |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3943 KEYEVENTF_EXTENDEDKEY | 0, 0); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3944 keybd_event ((BYTE) vk_code, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3945 (BYTE) MapVirtualKey (vk_code, 0), |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3946 KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3947 cur_state = !cur_state; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3948 } |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3949 if (!PostThreadMessage (dwMainThreadId, WM_EMACS_DONE, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3950 cur_state, 0)) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3951 abort (); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3952 } |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3953 break; |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3954 default: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3955 DebPrint (("msg %x not expected by w32_msg_pump\n", msg.message)); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3956 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3957 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3958 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3959 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3960 DispatchMessage (&msg); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3961 } |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3962 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3963 /* Exit nested loop when our deferred message has completed. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3964 if (msg_buf->completed) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3965 break; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3966 } |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3967 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3968 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3969 deferred_msg * deferred_msg_head; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3970 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3971 static deferred_msg * |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3972 find_deferred_msg (HWND hwnd, UINT msg) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3973 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3974 deferred_msg * item; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3975 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3976 /* Don't actually need synchronization for read access, since |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3977 modification of single pointer is always atomic. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3978 /* enter_crit (); */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3979 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3980 for (item = deferred_msg_head; item != NULL; item = item->next) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3981 if (item->w32msg.msg.hwnd == hwnd |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3982 && item->w32msg.msg.message == msg) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3983 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3984 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3985 /* leave_crit (); */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3986 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3987 return item; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3988 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3989 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3990 static LRESULT |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3991 send_deferred_msg (deferred_msg * msg_buf, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3992 HWND hwnd, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3993 UINT msg, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3994 WPARAM wParam, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3995 LPARAM lParam) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3996 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3997 /* Only input thread can send deferred messages. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3998 if (GetCurrentThreadId () != dwWindowsThreadId) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3999 abort (); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4000 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4001 /* It is an error to send a message that is already deferred. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4002 if (find_deferred_msg (hwnd, msg) != NULL) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4003 abort (); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4004 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4005 /* Enforced synchronization is not needed because this is the only |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4006 function that alters deferred_msg_head, and the following critical |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4007 section is guaranteed to only be serially reentered (since only the |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4008 input thread can call us). */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4009 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4010 /* enter_crit (); */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4011 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4012 msg_buf->completed = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4013 msg_buf->next = deferred_msg_head; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4014 deferred_msg_head = msg_buf; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4015 my_post_msg (&msg_buf->w32msg, hwnd, msg, wParam, lParam); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4016 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4017 /* leave_crit (); */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4018 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4019 /* Start a new nested message loop to process other messages until |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4020 this one is completed. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4021 w32_msg_pump (msg_buf); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4022 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4023 deferred_msg_head = msg_buf->next; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4024 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4025 return msg_buf->result; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4026 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4027 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4028 void |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4029 complete_deferred_msg (HWND hwnd, UINT msg, LRESULT result) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4030 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4031 deferred_msg * msg_buf = find_deferred_msg (hwnd, msg); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4032 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4033 if (msg_buf == NULL) |
23950
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4034 /* Message may have been cancelled, so don't abort(). */ |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4035 return; |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4036 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4037 msg_buf->result = result; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4038 msg_buf->completed = 1; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4039 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4040 /* Ensure input thread is woken so it notices the completion. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4041 PostThreadMessage (dwWindowsThreadId, WM_NULL, 0, 0); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4042 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4043 |
23950
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4044 void |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4045 cancel_all_deferred_msgs () |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4046 { |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4047 deferred_msg * item; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4048 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4049 /* Don't actually need synchronization for read access, since |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4050 modification of single pointer is always atomic. */ |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4051 /* enter_crit (); */ |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4052 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4053 for (item = deferred_msg_head; item != NULL; item = item->next) |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4054 { |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4055 item->result = 0; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4056 item->completed = 1; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4057 } |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4058 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4059 /* leave_crit (); */ |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4060 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4061 /* Ensure input thread is woken so it notices the completion. */ |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4062 PostThreadMessage (dwWindowsThreadId, WM_NULL, 0, 0); |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4063 } |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4064 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4065 DWORD |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4066 w32_msg_worker (dw) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4067 DWORD dw; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4068 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4069 MSG msg; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4070 deferred_msg dummy_buf; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4071 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4072 /* Ensure our message queue is created */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4073 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4074 PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4075 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4076 if (!PostThreadMessage (dwMainThreadId, WM_EMACS_DONE, 0, 0)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4077 abort (); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4078 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4079 memset (&dummy_buf, 0, sizeof (dummy_buf)); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4080 dummy_buf.w32msg.msg.hwnd = NULL; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4081 dummy_buf.w32msg.msg.message = WM_NULL; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4082 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4083 /* This is the inital message loop which should only exit when the |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4084 application quits. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4085 w32_msg_pump (&dummy_buf); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4086 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4087 return 0; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4088 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4089 |
23950
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4090 static void |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4091 post_character_message (hwnd, msg, wParam, lParam, modifiers) |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4092 HWND hwnd; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4093 UINT msg; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4094 WPARAM wParam; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4095 LPARAM lParam; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4096 DWORD modifiers; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4097 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4098 { |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4099 W32Msg wmsg; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4100 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4101 wmsg.dwModifiers = modifiers; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4102 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4103 /* Detect quit_char and set quit-flag directly. Note that we |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4104 still need to post a message to ensure the main thread will be |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4105 woken up if blocked in sys_select(), but we do NOT want to post |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4106 the quit_char message itself (because it will usually be as if |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4107 the user had typed quit_char twice). Instead, we post a dummy |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4108 message that has no particular effect. */ |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4109 { |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4110 int c = wParam; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4111 if (isalpha (c) && wmsg.dwModifiers == ctrl_modifier) |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4112 c = make_ctrl_char (c) & 0377; |
24339
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
4113 if (c == quit_char |
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
4114 || (wmsg.dwModifiers == 0 && |
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
4115 XFASTINT (Vw32_quit_key) && wParam == XFASTINT (Vw32_quit_key))) |
23950
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4116 { |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4117 Vquit_flag = Qt; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4118 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4119 /* The choice of message is somewhat arbitrary, as long as |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4120 the main thread handler just ignores it. */ |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4121 msg = WM_NULL; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4122 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4123 /* Interrupt any blocking system calls. */ |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4124 signal_quit (); |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4125 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4126 /* As a safety precaution, forcibly complete any deferred |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4127 messages. This is a kludge, but I don't see any particularly |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4128 clean way to handle the situation where a deferred message is |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4129 "dropped" in the lisp thread, and will thus never be |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4130 completed, eg. by the user trying to activate the menubar |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4131 when the lisp thread is busy, and then typing C-g when the |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4132 menubar doesn't open promptly (with the result that the |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4133 menubar never responds at all because the deferred |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4134 WM_INITMENU message is never completed). Another problem |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4135 situation is when the lisp thread calls SendMessage (to send |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4136 a window manager command) when a message has been deferred; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4137 the lisp thread gets blocked indefinitely waiting for the |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4138 deferred message to be completed, which itself is waiting for |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4139 the lisp thread to respond. |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4140 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4141 Note that we don't want to block the input thread waiting for |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4142 a reponse from the lisp thread (although that would at least |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4143 solve the deadlock problem above), because we want to be able |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4144 to receive C-g to interrupt the lisp thread. */ |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4145 cancel_all_deferred_msgs (); |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4146 } |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4147 } |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4148 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4149 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4150 } |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
4151 |
13434 | 4152 /* Main window procedure */ |
4153 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4154 LRESULT CALLBACK |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4155 w32_wnd_proc (hwnd, msg, wParam, lParam) |
13434 | 4156 HWND hwnd; |
4157 UINT msg; | |
4158 WPARAM wParam; | |
4159 LPARAM lParam; | |
4160 { | |
4161 struct frame *f; | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4162 struct w32_display_info *dpyinfo = &one_w32_display_info; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4163 W32Msg wmsg; |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4164 int windows_translate; |
24206
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4165 int key; |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4166 |
15650
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4167 /* Note that it is okay to call x_window_to_frame, even though we are |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4168 not running in the main lisp thread, because frame deletion |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4169 requires the lisp thread to synchronize with this thread. Thus, if |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4170 a frame struct is returned, it can be used without concern that the |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4171 lisp thread might make it disappear while we are using it. |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4172 |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4173 NB. Walking the frame list in this thread is safe (as long as |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4174 writes of Lisp_Object slots are atomic, which they are on Windows). |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4175 Although delete-frame can destructively modify the frame list while |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4176 we are walking it, a garbage collection cannot occur until after |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4177 delete-frame has synchronized with this thread. |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4178 |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4179 It is also safe to use functions that make GDI calls, such as |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4180 w32_clear_rect, because these functions must obtain a DC handle |
15650
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4181 from the frame struct using get_frame_dc which is thread-aware. */ |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4182 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4183 switch (msg) |
13434 | 4184 { |
4185 case WM_ERASEBKGND: | |
15650
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4186 f = x_window_to_frame (dpyinfo, hwnd); |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4187 if (f) |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4188 { |
27407
7df920562cbe
(w32_defined_color): Apply gamma correction before trying to map to
Jason Rumney <jasonr@gnu.org>
parents:
27397
diff
changeset
|
4189 HDC hdc = get_frame_dc (f); |
15650
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4190 GetUpdateRect (hwnd, &wmsg.rect, FALSE); |
27407
7df920562cbe
(w32_defined_color): Apply gamma correction before trying to map to
Jason Rumney <jasonr@gnu.org>
parents:
27397
diff
changeset
|
4191 w32_clear_rect (f, hdc, &wmsg.rect); |
7df920562cbe
(w32_defined_color): Apply gamma correction before trying to map to
Jason Rumney <jasonr@gnu.org>
parents:
27397
diff
changeset
|
4192 release_frame_dc (f, hdc); |
24718
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
4193 |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
4194 #if defined (W32_DEBUG_DISPLAY) |
39128
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4195 DebPrint (("WM_ERASEBKGND (frame %p): erasing %d,%d-%d,%d\n", |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4196 f, |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4197 wmsg.rect.left, wmsg.rect.top, |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4198 wmsg.rect.right, wmsg.rect.bottom)); |
24718
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
4199 #endif /* W32_DEBUG_DISPLAY */ |
15650
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4200 } |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4201 return 1; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4202 case WM_PALETTECHANGED: |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4203 /* ignore our own changes */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4204 if ((HWND)wParam != hwnd) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4205 { |
15650
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4206 f = x_window_to_frame (dpyinfo, hwnd); |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4207 if (f) |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4208 /* get_frame_dc will realize our palette and force all |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4209 frames to be redrawn if needed. */ |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
4210 release_frame_dc (f, get_frame_dc (f)); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4211 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4212 return 0; |
13434 | 4213 case WM_PAINT: |
24718
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
4214 { |
24670 | 4215 PAINTSTRUCT paintStruct; |
4216 RECT update_rect; | |
42935
20a21fb23284
(w32_wnd_proc) <WM_PAINT>: Initialize update_rect.
Jason Rumney <jasonr@gnu.org>
parents:
42918
diff
changeset
|
4217 bzero (&update_rect, sizeof (update_rect)); |
24670 | 4218 |
39128
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4219 f = x_window_to_frame (dpyinfo, hwnd); |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4220 if (f == 0) |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4221 { |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4222 DebPrint (("WM_PAINT received for unknown window %p\n", hwnd)); |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4223 return 0; |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4224 } |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4225 |
24670 | 4226 /* MSDN Docs say not to call BeginPaint if GetUpdateRect |
4227 fails. Apparently this can happen under some | |
4228 circumstances. */ | |
42935
20a21fb23284
(w32_wnd_proc) <WM_PAINT>: Initialize update_rect.
Jason Rumney <jasonr@gnu.org>
parents:
42918
diff
changeset
|
4229 if (GetUpdateRect (hwnd, &update_rect, FALSE) || !w32_strict_painting) |
24670 | 4230 { |
4231 enter_crit (); | |
4232 BeginPaint (hwnd, &paintStruct); | |
4233 | |
42935
20a21fb23284
(w32_wnd_proc) <WM_PAINT>: Initialize update_rect.
Jason Rumney <jasonr@gnu.org>
parents:
42918
diff
changeset
|
4234 /* The rectangles returned by GetUpdateRect and BeginPaint |
20a21fb23284
(w32_wnd_proc) <WM_PAINT>: Initialize update_rect.
Jason Rumney <jasonr@gnu.org>
parents:
42918
diff
changeset
|
4235 do not always match. Play it safe by assuming both areas |
20a21fb23284
(w32_wnd_proc) <WM_PAINT>: Initialize update_rect.
Jason Rumney <jasonr@gnu.org>
parents:
42918
diff
changeset
|
4236 are invalid. */ |
20a21fb23284
(w32_wnd_proc) <WM_PAINT>: Initialize update_rect.
Jason Rumney <jasonr@gnu.org>
parents:
42918
diff
changeset
|
4237 UnionRect (&(wmsg.rect), &update_rect, &(paintStruct.rcPaint)); |
24670 | 4238 |
4239 #if defined (W32_DEBUG_DISPLAY) | |
39128
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4240 DebPrint (("WM_PAINT (frame %p): painting %d,%d-%d,%d\n", |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4241 f, |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4242 wmsg.rect.left, wmsg.rect.top, |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4243 wmsg.rect.right, wmsg.rect.bottom)); |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
4244 DebPrint ((" [update region is %d,%d-%d,%d]\n", |
24670 | 4245 update_rect.left, update_rect.top, |
4246 update_rect.right, update_rect.bottom)); | |
4247 #endif | |
4248 EndPaint (hwnd, &paintStruct); | |
4249 leave_crit (); | |
4250 | |
4251 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4252 |
24670 | 4253 return 0; |
4254 } | |
24695
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
4255 |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
4256 /* If GetUpdateRect returns 0 (meaning there is no update |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
4257 region), assume the whole window needs to be repainted. */ |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
4258 GetClientRect(hwnd, &wmsg.rect); |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
4259 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
4260 return 0; |
13434 | 4261 } |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
4262 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4263 case WM_INPUTLANGCHANGE: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4264 /* Inform lisp thread of keyboard layout changes. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4265 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4266 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4267 /* Clear dead keys in the keyboard state; for simplicity only |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4268 preserve modifier key states. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4269 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4270 int i; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4271 BYTE keystate[256]; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4272 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4273 GetKeyboardState (keystate); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4274 for (i = 0; i < 256; i++) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4275 if (1 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4276 && i != VK_SHIFT |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4277 && i != VK_LSHIFT |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4278 && i != VK_RSHIFT |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4279 && i != VK_CAPITAL |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4280 && i != VK_NUMLOCK |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4281 && i != VK_SCROLL |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4282 && i != VK_CONTROL |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4283 && i != VK_LCONTROL |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4284 && i != VK_RCONTROL |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4285 && i != VK_MENU |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4286 && i != VK_LMENU |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4287 && i != VK_RMENU |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4288 && i != VK_LWIN |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4289 && i != VK_RWIN) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4290 keystate[i] = 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4291 SetKeyboardState (keystate); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4292 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4293 goto dflt; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4294 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4295 case WM_HOTKEY: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4296 /* Synchronize hot keys with normal input. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4297 PostMessage (hwnd, WM_KEYDOWN, HIWORD (lParam), 0); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4298 return (0); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4299 |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
4300 case WM_KEYUP: |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
4301 case WM_SYSKEYUP: |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
4302 record_keyup (wParam, lParam); |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
4303 goto dflt; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
4304 |
13434 | 4305 case WM_KEYDOWN: |
4306 case WM_SYSKEYDOWN: | |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4307 /* Ignore keystrokes we fake ourself; see below. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4308 if (dpyinfo->faked_key == wParam) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4309 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4310 dpyinfo->faked_key = 0; |
24206
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4311 /* Make sure TranslateMessage sees them though (as long as |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4312 they don't produce WM_CHAR messages). This ensures that |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4313 indicator lights are toggled promptly on Windows 9x, for |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4314 example. */ |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4315 if (lispy_function_keys[wParam] != 0) |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4316 { |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4317 windows_translate = 1; |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4318 goto translate; |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4319 } |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4320 return 0; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4321 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4322 |
15377
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
4323 /* Synchronize modifiers with current keystroke. */ |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
4324 sync_modifiers (); |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
4325 record_keydown (wParam, lParam); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4326 wParam = map_keypad_keys (wParam, (lParam & 0x1000000L) != 0); |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4327 |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4328 windows_translate = 0; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4329 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4330 switch (wParam) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4331 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4332 case VK_LWIN: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4333 if (NILP (Vw32_pass_lwindow_to_system)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4334 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4335 /* Prevent system from acting on keyup (which opens the |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4336 Start menu if no other key was pressed) by simulating a |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4337 press of Space which we will ignore. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4338 if (GetAsyncKeyState (wParam) & 1) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4339 { |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4340 if (NUMBERP (Vw32_phantom_key_code)) |
24206
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4341 key = XUINT (Vw32_phantom_key_code) & 255; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4342 else |
24206
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4343 key = VK_SPACE; |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4344 dpyinfo->faked_key = key; |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4345 keybd_event (key, (BYTE) MapVirtualKey (key, 0), 0, 0); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4346 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4347 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4348 if (!NILP (Vw32_lwindow_modifier)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4349 return 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4350 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4351 case VK_RWIN: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4352 if (NILP (Vw32_pass_rwindow_to_system)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4353 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4354 if (GetAsyncKeyState (wParam) & 1) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4355 { |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4356 if (NUMBERP (Vw32_phantom_key_code)) |
24206
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4357 key = XUINT (Vw32_phantom_key_code) & 255; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4358 else |
24206
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4359 key = VK_SPACE; |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4360 dpyinfo->faked_key = key; |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4361 keybd_event (key, (BYTE) MapVirtualKey (key, 0), 0, 0); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4362 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4363 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4364 if (!NILP (Vw32_rwindow_modifier)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4365 return 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4366 break; |
24206
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
4367 case VK_APPS: |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4368 if (!NILP (Vw32_apps_modifier)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4369 return 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4370 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4371 case VK_MENU: |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4372 if (NILP (Vw32_pass_alt_to_system)) |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4373 /* Prevent DefWindowProc from activating the menu bar if an |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4374 Alt key is pressed and released by itself. */ |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4375 return 0; |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4376 windows_translate = 1; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4377 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4378 case VK_CAPITAL: |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4379 /* Decide whether to treat as modifier or function key. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4380 if (NILP (Vw32_enable_caps_lock)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4381 goto disable_lock_key; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4382 windows_translate = 1; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4383 break; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4384 case VK_NUMLOCK: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4385 /* Decide whether to treat as modifier or function key. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4386 if (NILP (Vw32_enable_num_lock)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4387 goto disable_lock_key; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4388 windows_translate = 1; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4389 break; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4390 case VK_SCROLL: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4391 /* Decide whether to treat as modifier or function key. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4392 if (NILP (Vw32_scroll_lock_modifier)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4393 goto disable_lock_key; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4394 windows_translate = 1; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4395 break; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4396 disable_lock_key: |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4397 /* Ensure the appropriate lock key state (and indicator light) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4398 remains in the same state. We do this by faking another |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4399 press of the relevant key. Apparently, this really is the |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4400 only way to toggle the state of the indicator lights. */ |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4401 dpyinfo->faked_key = wParam; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4402 keybd_event ((BYTE) wParam, (BYTE) MapVirtualKey (wParam, 0), |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4403 KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4404 keybd_event ((BYTE) wParam, (BYTE) MapVirtualKey (wParam, 0), |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4405 KEYEVENTF_EXTENDEDKEY | 0, 0); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4406 keybd_event ((BYTE) wParam, (BYTE) MapVirtualKey (wParam, 0), |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4407 KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4408 /* Ensure indicator lights are updated promptly on Windows 9x |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4409 (TranslateMessage apparently does this), after forwarding |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4410 input event. */ |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4411 post_character_message (hwnd, msg, wParam, lParam, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4412 w32_get_key_modifiers (wParam, lParam)); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4413 windows_translate = 1; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4414 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4415 case VK_CONTROL: |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4416 case VK_SHIFT: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4417 case VK_PROCESSKEY: /* Generated by IME. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4418 windows_translate = 1; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4419 break; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4420 case VK_CANCEL: |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4421 /* Windows maps Ctrl-Pause (aka Ctrl-Break) into VK_CANCEL, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4422 which is confusing for purposes of key binding; convert |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4423 VK_CANCEL events into VK_PAUSE events. */ |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4424 wParam = VK_PAUSE; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4425 break; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4426 case VK_PAUSE: |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4427 /* Windows maps Ctrl-NumLock into VK_PAUSE, which is confusing |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4428 for purposes of key binding; convert these back into |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4429 VK_NUMLOCK events, at least when we want to see NumLock key |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4430 presses. (Note that there is never any possibility that |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4431 VK_PAUSE with Ctrl really is C-Pause as per above.) */ |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4432 if (NILP (Vw32_enable_num_lock) && modifier_set (VK_CONTROL)) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4433 wParam = VK_NUMLOCK; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4434 break; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4435 default: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4436 /* If not defined as a function key, change it to a WM_CHAR message. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4437 if (lispy_function_keys[wParam] == 0) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4438 { |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4439 DWORD modifiers = construct_console_modifiers (); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4440 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4441 if (!NILP (Vw32_recognize_altgr) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4442 && modifier_set (VK_LCONTROL) && modifier_set (VK_RMENU)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4443 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4444 /* Always let TranslateMessage handle AltGr key chords; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4445 for some reason, ToAscii doesn't always process AltGr |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4446 chords correctly. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4447 windows_translate = 1; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4448 } |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4449 else if ((modifiers & (~SHIFT_PRESSED & ~CAPSLOCK_ON)) != 0) |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4450 { |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4451 /* Handle key chords including any modifiers other |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4452 than shift directly, in order to preserve as much |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4453 modifier information as possible. */ |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4454 if ('A' <= wParam && wParam <= 'Z') |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4455 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4456 /* Don't translate modified alphabetic keystrokes, |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4457 so the user doesn't need to constantly switch |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4458 layout to type control or meta keystrokes when |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4459 the normal layout translates alphabetic |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4460 characters to non-ascii characters. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4461 if (!modifier_set (VK_SHIFT)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4462 wParam += ('a' - 'A'); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4463 msg = WM_CHAR; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4464 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4465 else |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4466 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4467 /* Try to handle other keystrokes by determining the |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4468 base character (ie. translating the base key plus |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4469 shift modifier). */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4470 int add; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4471 int isdead = 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4472 KEY_EVENT_RECORD key; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4473 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4474 key.bKeyDown = TRUE; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4475 key.wRepeatCount = 1; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4476 key.wVirtualKeyCode = wParam; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4477 key.wVirtualScanCode = (lParam & 0xFF0000) >> 16; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4478 key.uChar.AsciiChar = 0; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4479 key.dwControlKeyState = modifiers; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4480 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4481 add = w32_kbd_patch_key (&key); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4482 /* 0 means an unrecognised keycode, negative means |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4483 dead key. Ignore both. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4484 while (--add >= 0) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4485 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4486 /* Forward asciified character sequence. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4487 post_character_message |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4488 (hwnd, WM_CHAR, key.uChar.AsciiChar, lParam, |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4489 w32_get_key_modifiers (wParam, lParam)); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4490 w32_kbd_patch_key (&key); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4491 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4492 return 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4493 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4494 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4495 else |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4496 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4497 /* Let TranslateMessage handle everything else. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4498 windows_translate = 1; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4499 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4500 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4501 } |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
4502 |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4503 translate: |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4504 if (windows_translate) |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4505 { |
16884
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16602
diff
changeset
|
4506 MSG windows_msg = { hwnd, msg, wParam, lParam, 0, {0,0} }; |
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16602
diff
changeset
|
4507 |
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16602
diff
changeset
|
4508 windows_msg.time = GetMessageTime (); |
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16602
diff
changeset
|
4509 TranslateMessage (&windows_msg); |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4510 goto dflt; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4511 } |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4512 |
13434 | 4513 /* Fall through */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4514 |
13434 | 4515 case WM_SYSCHAR: |
4516 case WM_CHAR: | |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4517 post_character_message (hwnd, msg, wParam, lParam, |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4518 w32_get_key_modifiers (wParam, lParam)); |
13434 | 4519 break; |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
4520 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4521 /* Simulate middle mouse button events when left and right buttons |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4522 are used together, but only if user has two button mouse. */ |
13434 | 4523 case WM_LBUTTONDOWN: |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4524 case WM_RBUTTONDOWN: |
27894
6c4ff3519d09
(w32_wnd_proc) [WM_LBUTTON_DOWN, WM_RBUTTON_DOWN, WM_LBUTTON_UP,
Jason Rumney <jasonr@gnu.org>
parents:
27516
diff
changeset
|
4525 if (XINT (Vw32_num_mouse_buttons) > 2) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4526 goto handle_plain_button; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4527 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4528 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4529 int this = (msg == WM_LBUTTONDOWN) ? LMOUSE : RMOUSE; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4530 int other = (msg == WM_LBUTTONDOWN) ? RMOUSE : LMOUSE; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4531 |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
4532 if (button_state & this) |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
4533 return 0; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4534 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4535 if (button_state == 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4536 SetCapture (hwnd); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4537 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4538 button_state |= this; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4539 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4540 if (button_state & other) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4541 { |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4542 if (mouse_button_timer) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4543 { |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4544 KillTimer (hwnd, mouse_button_timer); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4545 mouse_button_timer = 0; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4546 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4547 /* Generate middle mouse event instead. */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4548 msg = WM_MBUTTONDOWN; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4549 button_state |= MMOUSE; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4550 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4551 else if (button_state & MMOUSE) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4552 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4553 /* Ignore button event if we've already generated a |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4554 middle mouse down event. This happens if the |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4555 user releases and press one of the two buttons |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4556 after we've faked a middle mouse event. */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4557 return 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4558 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4559 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4560 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4561 /* Flush out saved message. */ |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4562 post_msg (&saved_mouse_button_msg); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4563 } |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4564 wmsg.dwModifiers = w32_get_modifiers (); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4565 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4566 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4567 /* Clear message buffer. */ |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4568 saved_mouse_button_msg.msg.hwnd = 0; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4569 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4570 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4571 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4572 /* Hold onto message for now. */ |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4573 mouse_button_timer = |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4574 SetTimer (hwnd, MOUSE_BUTTON_ID, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4575 XINT (Vw32_mouse_button_tolerance), NULL); |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4576 saved_mouse_button_msg.msg.hwnd = hwnd; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4577 saved_mouse_button_msg.msg.message = msg; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4578 saved_mouse_button_msg.msg.wParam = wParam; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4579 saved_mouse_button_msg.msg.lParam = lParam; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4580 saved_mouse_button_msg.msg.time = GetMessageTime (); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4581 saved_mouse_button_msg.dwModifiers = w32_get_modifiers (); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4582 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4583 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4584 return 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4585 |
13434 | 4586 case WM_LBUTTONUP: |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4587 case WM_RBUTTONUP: |
27894
6c4ff3519d09
(w32_wnd_proc) [WM_LBUTTON_DOWN, WM_RBUTTON_DOWN, WM_LBUTTON_UP,
Jason Rumney <jasonr@gnu.org>
parents:
27516
diff
changeset
|
4588 if (XINT (Vw32_num_mouse_buttons) > 2) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4589 goto handle_plain_button; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4590 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4591 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4592 int this = (msg == WM_LBUTTONUP) ? LMOUSE : RMOUSE; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4593 int other = (msg == WM_LBUTTONUP) ? RMOUSE : LMOUSE; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4594 |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
4595 if ((button_state & this) == 0) |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
4596 return 0; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4597 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4598 button_state &= ~this; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4599 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4600 if (button_state & MMOUSE) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4601 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4602 /* Only generate event when second button is released. */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4603 if ((button_state & other) == 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4604 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4605 msg = WM_MBUTTONUP; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4606 button_state &= ~MMOUSE; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4607 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4608 if (button_state) abort (); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4609 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4610 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4611 return 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4612 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4613 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4614 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4615 /* Flush out saved message if necessary. */ |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4616 if (saved_mouse_button_msg.msg.hwnd) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4617 { |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4618 post_msg (&saved_mouse_button_msg); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4619 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4620 } |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4621 wmsg.dwModifiers = w32_get_modifiers (); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4622 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4623 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4624 /* Always clear message buffer and cancel timer. */ |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4625 saved_mouse_button_msg.msg.hwnd = 0; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4626 KillTimer (hwnd, mouse_button_timer); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4627 mouse_button_timer = 0; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4628 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4629 if (button_state == 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4630 ReleaseCapture (); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4631 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4632 return 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4633 |
42719
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
4634 case WM_XBUTTONDOWN: |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
4635 case WM_XBUTTONUP: |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
4636 if (w32_pass_extra_mouse_buttons_to_system) |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
4637 goto dflt; |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
4638 /* else fall through and process them. */ |
13434 | 4639 case WM_MBUTTONDOWN: |
4640 case WM_MBUTTONUP: | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4641 handle_plain_button: |
13434 | 4642 { |
4643 BOOL up; | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4644 int button; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4645 |
42719
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
4646 if (parse_button (msg, HIWORD (wParam), &button, &up)) |
13434 | 4647 { |
4648 if (up) ReleaseCapture (); | |
4649 else SetCapture (hwnd); | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4650 button = (button == 0) ? LMOUSE : |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4651 ((button == 1) ? MMOUSE : RMOUSE); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4652 if (up) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4653 button_state &= ~button; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4654 else |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4655 button_state |= button; |
13434 | 4656 } |
4657 } | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4658 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4659 wmsg.dwModifiers = w32_get_modifiers (); |
13434 | 4660 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
42719
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
4661 |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
4662 /* Need to return true for XBUTTON messages, false for others, |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
4663 to indicate that we processed the message. */ |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
4664 return (msg == WM_XBUTTONDOWN || msg == WM_XBUTTONUP); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4665 |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4666 case WM_MOUSEMOVE: |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4667 /* If the mouse has just moved into the frame, start tracking |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4668 it, so we will be notified when it leaves the frame. Mouse |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4669 tracking only works under W98 and NT4 and later. On earlier |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4670 versions, there is no way of telling when the mouse leaves the |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4671 frame, so we just have to put up with help-echo and mouse |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4672 highlighting remaining while the frame is not active. */ |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4673 if (track_mouse_event_fn && !track_mouse_window) |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4674 { |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4675 TRACKMOUSEEVENT tme; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4676 tme.cbSize = sizeof (tme); |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4677 tme.dwFlags = TME_LEAVE; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4678 tme.hwndTrack = hwnd; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4679 |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4680 track_mouse_event_fn (&tme); |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4681 track_mouse_window = hwnd; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4682 } |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4683 case WM_VSCROLL: |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4684 if (XINT (Vw32_mouse_move_interval) <= 0 |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4685 || (msg == WM_MOUSEMOVE && button_state == 0)) |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4686 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4687 wmsg.dwModifiers = w32_get_modifiers (); |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4688 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4689 return 0; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4690 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4691 |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4692 /* Hang onto mouse move and scroll messages for a bit, to avoid |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4693 sending such events to Emacs faster than it can process them. |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4694 If we get more events before the timer from the first message |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4695 expires, we just replace the first message. */ |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4696 |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4697 if (saved_mouse_move_msg.msg.hwnd == 0) |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4698 mouse_move_timer = |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4699 SetTimer (hwnd, MOUSE_MOVE_ID, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4700 XINT (Vw32_mouse_move_interval), NULL); |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4701 |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4702 /* Hold onto message for now. */ |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4703 saved_mouse_move_msg.msg.hwnd = hwnd; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4704 saved_mouse_move_msg.msg.message = msg; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4705 saved_mouse_move_msg.msg.wParam = wParam; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4706 saved_mouse_move_msg.msg.lParam = lParam; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4707 saved_mouse_move_msg.msg.time = GetMessageTime (); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4708 saved_mouse_move_msg.dwModifiers = w32_get_modifiers (); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4709 |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4710 return 0; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4711 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4712 case WM_MOUSEWHEEL: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4713 wmsg.dwModifiers = w32_get_modifiers (); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4714 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4715 return 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4716 |
21884 | 4717 case WM_DROPFILES: |
4718 wmsg.dwModifiers = w32_get_modifiers (); | |
4719 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); | |
4720 return 0; | |
4721 | |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4722 case WM_TIMER: |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4723 /* Flush out saved messages if necessary. */ |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4724 if (wParam == mouse_button_timer) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4725 { |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4726 if (saved_mouse_button_msg.msg.hwnd) |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4727 { |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4728 post_msg (&saved_mouse_button_msg); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4729 saved_mouse_button_msg.msg.hwnd = 0; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4730 } |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4731 KillTimer (hwnd, mouse_button_timer); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4732 mouse_button_timer = 0; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4733 } |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4734 else if (wParam == mouse_move_timer) |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4735 { |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4736 if (saved_mouse_move_msg.msg.hwnd) |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4737 { |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4738 post_msg (&saved_mouse_move_msg); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4739 saved_mouse_move_msg.msg.hwnd = 0; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4740 } |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4741 KillTimer (hwnd, mouse_move_timer); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4742 mouse_move_timer = 0; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4743 } |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4744 else if (wParam == menu_free_timer) |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4745 { |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4746 KillTimer (hwnd, menu_free_timer); |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4747 menu_free_timer = 0; |
43484
a3cecd273126
(w32_wnd_proc) <WM_TIMER>: Fix last change.
Jason Rumney <jasonr@gnu.org>
parents:
43472
diff
changeset
|
4748 f = x_window_to_frame (dpyinfo, hwnd); |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4749 if (!f->output_data.w32->menu_command_in_progress) |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4750 { |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4751 /* Free memory used by owner-drawn and help-echo strings. */ |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4752 w32_free_menu_strings (hwnd); |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4753 f->output_data.w32->menubar_active = 0; |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4754 } |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4755 } |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4756 return 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4757 |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4758 case WM_NCACTIVATE: |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4759 /* Windows doesn't send us focus messages when putting up and |
16884
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16602
diff
changeset
|
4760 taking down a system popup dialog as for Ctrl-Alt-Del on Windows 95. |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4761 The only indication we get that something happened is receiving |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4762 this message afterwards. So this is a good time to reset our |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4763 keyboard modifiers' state. */ |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4764 reset_modifiers (); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4765 goto dflt; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
4766 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4767 case WM_INITMENU: |
24751
e0eaca5025bc
(w32_wnd_proc): Ensure mouse capture is released if
Andrew Innes <andrewi@gnu.org>
parents:
24718
diff
changeset
|
4768 button_state = 0; |
e0eaca5025bc
(w32_wnd_proc): Ensure mouse capture is released if
Andrew Innes <andrewi@gnu.org>
parents:
24718
diff
changeset
|
4769 ReleaseCapture (); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4770 /* We must ensure menu bar is fully constructed and up to date |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4771 before allowing user interaction with it. To achieve this |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4772 we send this message to the lisp thread and wait for a |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4773 reply (whose value is not actually needed) to indicate that |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4774 the menu bar is now ready for use, so we can now return. |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4775 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4776 To remain responsive in the meantime, we enter a nested message |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4777 loop that can process all other messages. |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4778 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4779 However, we skip all this if the message results from calling |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4780 TrackPopupMenu - in fact, we must NOT attempt to send the lisp |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4781 thread a message because it is blocked on us at this point. We |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4782 set menubar_active before calling TrackPopupMenu to indicate |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4783 this (there is no possibility of confusion with real menubar |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4784 being active). */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4785 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4786 f = x_window_to_frame (dpyinfo, hwnd); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4787 if (f |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4788 && (f->output_data.w32->menubar_active |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4789 /* We can receive this message even in the absence of a |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4790 menubar (ie. when the system menu is activated) - in this |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4791 case we do NOT want to forward the message, otherwise it |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4792 will cause the menubar to suddenly appear when the user |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4793 had requested it to be turned off! */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4794 || f->output_data.w32->menubar_widget == NULL)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4795 return 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4796 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4797 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4798 deferred_msg msg_buf; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4799 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4800 /* Detect if message has already been deferred; in this case |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4801 we cannot return any sensible value to ignore this. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4802 if (find_deferred_msg (hwnd, msg) != NULL) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4803 abort (); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4804 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4805 return send_deferred_msg (&msg_buf, hwnd, msg, wParam, lParam); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4806 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4807 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4808 case WM_EXITMENULOOP: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4809 f = x_window_to_frame (dpyinfo, hwnd); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4810 |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4811 /* If a menu command is not already in progress, check again |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4812 after a short delay, since Windows often (always?) sends the |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4813 WM_EXITMENULOOP before the corresponding WM_COMMAND message. */ |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4814 if (f && !f->output_data.w32->menu_command_in_progress) |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4815 menu_free_timer = SetTimer (hwnd, MENU_FREE_ID, MENU_FREE_DELAY, NULL); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4816 goto dflt; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4817 |
28272
f62bb21d38db
(w32_wnd_proc): Handle WM_MENUSELECT message.
Jason Rumney <jasonr@gnu.org>
parents:
27936
diff
changeset
|
4818 case WM_MENUSELECT: |
41638
aadcf676d5de
(w32_wnd_proc) <WM_MENUSELECT>: Display help directly.
Jason Rumney <jasonr@gnu.org>
parents:
41480
diff
changeset
|
4819 /* Direct handling of help_echo in menus. Should be safe now |
aadcf676d5de
(w32_wnd_proc) <WM_MENUSELECT>: Display help directly.
Jason Rumney <jasonr@gnu.org>
parents:
41480
diff
changeset
|
4820 that we generate the help_echo by placing a help event in the |
aadcf676d5de
(w32_wnd_proc) <WM_MENUSELECT>: Display help directly.
Jason Rumney <jasonr@gnu.org>
parents:
41480
diff
changeset
|
4821 keyboard buffer. */ |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4822 { |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4823 HMENU menu = (HMENU) lParam; |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4824 UINT menu_item = (UINT) LOWORD (wParam); |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4825 UINT flags = (UINT) HIWORD (wParam); |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4826 |
41638
aadcf676d5de
(w32_wnd_proc) <WM_MENUSELECT>: Display help directly.
Jason Rumney <jasonr@gnu.org>
parents:
41480
diff
changeset
|
4827 w32_menu_display_help (hwnd, menu, menu_item, flags); |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4828 } |
28272
f62bb21d38db
(w32_wnd_proc): Handle WM_MENUSELECT message.
Jason Rumney <jasonr@gnu.org>
parents:
27936
diff
changeset
|
4829 return 0; |
f62bb21d38db
(w32_wnd_proc): Handle WM_MENUSELECT message.
Jason Rumney <jasonr@gnu.org>
parents:
27936
diff
changeset
|
4830 |
21735
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4831 case WM_MEASUREITEM: |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4832 f = x_window_to_frame (dpyinfo, hwnd); |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4833 if (f) |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4834 { |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4835 MEASUREITEMSTRUCT * pMis = (MEASUREITEMSTRUCT *) lParam; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4836 |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4837 if (pMis->CtlType == ODT_MENU) |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4838 { |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4839 /* Work out dimensions for popup menu titles. */ |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4840 char * title = (char *) pMis->itemData; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4841 HDC hdc = GetDC (hwnd); |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4842 HFONT menu_font = GetCurrentObject (hdc, OBJ_FONT); |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4843 LOGFONT menu_logfont; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4844 HFONT old_font; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4845 SIZE size; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4846 |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4847 GetObject (menu_font, sizeof (menu_logfont), &menu_logfont); |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4848 menu_logfont.lfWeight = FW_BOLD; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4849 menu_font = CreateFontIndirect (&menu_logfont); |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4850 old_font = SelectObject (hdc, menu_font); |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4851 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
4852 pMis->itemHeight = GetSystemMetrics (SM_CYMENUSIZE); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
4853 if (title) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
4854 { |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
4855 GetTextExtentPoint32 (hdc, title, strlen (title), &size); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
4856 pMis->itemWidth = size.cx; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
4857 if (pMis->itemHeight < size.cy) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
4858 pMis->itemHeight = size.cy; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
4859 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
4860 else |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
4861 pMis->itemWidth = 0; |
21735
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4862 |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4863 SelectObject (hdc, old_font); |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4864 DeleteObject (menu_font); |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4865 ReleaseDC (hwnd, hdc); |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4866 return TRUE; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4867 } |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4868 } |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4869 return 0; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4870 |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4871 case WM_DRAWITEM: |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4872 f = x_window_to_frame (dpyinfo, hwnd); |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4873 if (f) |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4874 { |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4875 DRAWITEMSTRUCT * pDis = (DRAWITEMSTRUCT *) lParam; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4876 |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4877 if (pDis->CtlType == ODT_MENU) |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4878 { |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4879 /* Draw popup menu title. */ |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4880 char * title = (char *) pDis->itemData; |
30239
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4881 if (title) |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4882 { |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4883 HDC hdc = pDis->hDC; |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4884 HFONT menu_font = GetCurrentObject (hdc, OBJ_FONT); |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4885 LOGFONT menu_logfont; |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4886 HFONT old_font; |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4887 |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4888 GetObject (menu_font, sizeof (menu_logfont), &menu_logfont); |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4889 menu_logfont.lfWeight = FW_BOLD; |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4890 menu_font = CreateFontIndirect (&menu_logfont); |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4891 old_font = SelectObject (hdc, menu_font); |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4892 |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4893 /* Always draw title as if not selected. */ |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4894 ExtTextOut (hdc, |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4895 pDis->rcItem.left |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4896 + GetSystemMetrics (SM_CXMENUCHECK), |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4897 pDis->rcItem.top, |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4898 ETO_OPAQUE, &pDis->rcItem, |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4899 title, strlen (title), NULL); |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4900 |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4901 SelectObject (hdc, old_font); |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4902 DeleteObject (menu_font); |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
4903 } |
21735
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4904 return TRUE; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4905 } |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4906 } |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4907 return 0; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
4908 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4909 #if 0 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4910 /* Still not right - can't distinguish between clicks in the |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4911 client area of the frame from clicks forwarded from the scroll |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4912 bars - may have to hook WM_NCHITTEST to remember the mouse |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4913 position and then check if it is in the client area ourselves. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4914 case WM_MOUSEACTIVATE: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4915 /* Discard the mouse click that activates a frame, allowing the |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4916 user to click anywhere without changing point (or worse!). |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4917 Don't eat mouse clicks on scrollbars though!! */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4918 if (LOWORD (lParam) == HTCLIENT ) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4919 return MA_ACTIVATEANDEAT; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4920 goto dflt; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4921 #endif |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4922 |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4923 case WM_MOUSELEAVE: |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4924 /* No longer tracking mouse. */ |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4925 track_mouse_window = NULL; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
4926 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4927 case WM_ACTIVATEAPP: |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4928 case WM_ACTIVATE: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4929 case WM_WINDOWPOSCHANGED: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4930 case WM_SHOWWINDOW: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4931 /* Inform lisp thread that a frame might have just been obscured |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4932 or exposed, so should recheck visibility of all frames. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4933 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4934 goto dflt; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4935 |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
4936 case WM_SETFOCUS: |
48375
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4937 /* |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4938 Reinitialize the function pointer track_mouse_event_fn here. |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4939 This is required even though it is initialized in syms_of_w32fns |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4940 which is called in main (emacs.c). |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4941 Reinitialize the function pointer track_mouse_event_fn here. |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4942 Even though this function pointer is initialized in |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4943 syms_of_w32fns which is called from main (emacs.c), |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4944 we need to initialize it again here in order to prevent |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4945 a crash that occurs in Windows 9x (possibly only when Emacs |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4946 was built on Windows NT / 2000 / XP?) when handling the |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4947 WM_MOUSEMOVE message. |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4948 The crash occurs when attempting to call the Win32 API |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4949 function TrackMouseEvent through the function pointer. |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4950 It appears as if the function pointer that is obtained when |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4951 syms_of_w32fns is called from main is no longer valid |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4952 (possibly due to DLL relocation?). |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4953 To resolve this issue, I have placed a call to reinitialize |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4954 this function pointer here because this message gets received |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4955 when the Emacs window gains focus. |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4956 */ |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4957 track_mouse_event_fn = |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4958 (TrackMouseEvent_Proc) GetProcAddress ( |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4959 GetModuleHandle ("user32.dll"), |
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
4960 "TrackMouseEvent"); |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4961 dpyinfo->faked_key = 0; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
4962 reset_modifiers (); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4963 register_hot_keys (hwnd); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4964 goto command; |
15314
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
4965 case WM_KILLFOCUS: |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4966 unregister_hot_keys (hwnd); |
24751
e0eaca5025bc
(w32_wnd_proc): Ensure mouse capture is released if
Andrew Innes <andrewi@gnu.org>
parents:
24718
diff
changeset
|
4967 button_state = 0; |
e0eaca5025bc
(w32_wnd_proc): Ensure mouse capture is released if
Andrew Innes <andrewi@gnu.org>
parents:
24718
diff
changeset
|
4968 ReleaseCapture (); |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
4969 /* Relinquish the system caret. */ |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
4970 if (w32_system_caret_hwnd) |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
4971 { |
42918
9b06036a8c5e
(syms_of_w32fns): Initialize w32_visible_system_caret_hwnd.
Jason Rumney <jasonr@gnu.org>
parents:
42865
diff
changeset
|
4972 w32_visible_system_caret_hwnd = NULL; |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
4973 w32_system_caret_hwnd = NULL; |
42918
9b06036a8c5e
(syms_of_w32fns): Initialize w32_visible_system_caret_hwnd.
Jason Rumney <jasonr@gnu.org>
parents:
42865
diff
changeset
|
4974 DestroyCaret (); |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
4975 } |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4976 goto command; |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4977 case WM_COMMAND: |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4978 f = x_window_to_frame (dpyinfo, hwnd); |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4979 if (f && HIWORD (wParam) == 0) |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4980 { |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4981 f->output_data.w32->menu_command_in_progress = 1; |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4982 if (menu_free_timer) |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4983 { |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4984 KillTimer (hwnd, menu_free_timer); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4985 menu_free_timer = 0; |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4986 } |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
4987 } |
13434 | 4988 case WM_MOVE: |
4989 case WM_SIZE: | |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
4990 command: |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4991 wmsg.dwModifiers = w32_get_modifiers (); |
13434 | 4992 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
4993 goto dflt; | |
15034
fb947ec168a8
(defined_color): Map color to nearest in default palette.
Richard M. Stallman <rms@gnu.org>
parents:
14983
diff
changeset
|
4994 |
fb947ec168a8
(defined_color): Map color to nearest in default palette.
Richard M. Stallman <rms@gnu.org>
parents:
14983
diff
changeset
|
4995 case WM_CLOSE: |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4996 wmsg.dwModifiers = w32_get_modifiers (); |
15034
fb947ec168a8
(defined_color): Map color to nearest in default palette.
Richard M. Stallman <rms@gnu.org>
parents:
14983
diff
changeset
|
4997 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
fb947ec168a8
(defined_color): Map color to nearest in default palette.
Richard M. Stallman <rms@gnu.org>
parents:
14983
diff
changeset
|
4998 return 0; |
fb947ec168a8
(defined_color): Map color to nearest in default palette.
Richard M. Stallman <rms@gnu.org>
parents:
14983
diff
changeset
|
4999 |
13434 | 5000 case WM_WINDOWPOSCHANGING: |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5001 /* Don't restrict the sizing of tip frames. */ |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5002 if (hwnd == tip_window) |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5003 return 0; |
13434 | 5004 { |
5005 WINDOWPLACEMENT wp; | |
5006 LPWINDOWPOS lppos = (WINDOWPOS *) lParam; | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5007 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5008 wp.length = sizeof (WINDOWPLACEMENT); |
13434 | 5009 GetWindowPlacement (hwnd, &wp); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5010 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5011 if (wp.showCmd != SW_SHOWMINIMIZED && (lppos->flags & SWP_NOSIZE) == 0) |
13434 | 5012 { |
5013 RECT rect; | |
5014 int wdiff; | |
5015 int hdiff; | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5016 DWORD font_width; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5017 DWORD line_height; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5018 DWORD internal_border; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5019 DWORD scrollbar_extra; |
13434 | 5020 RECT wr; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5021 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5022 wp.length = sizeof(wp); |
13434 | 5023 GetWindowRect (hwnd, &wr); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5024 |
14353 | 5025 enter_crit (); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5026 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5027 font_width = GetWindowLong (hwnd, WND_FONTWIDTH_INDEX); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5028 line_height = GetWindowLong (hwnd, WND_LINEHEIGHT_INDEX); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5029 internal_border = GetWindowLong (hwnd, WND_BORDER_INDEX); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5030 scrollbar_extra = GetWindowLong (hwnd, WND_SCROLLBAR_INDEX); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5031 |
14353 | 5032 leave_crit (); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5033 |
13434 | 5034 memset (&rect, 0, sizeof (rect)); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5035 AdjustWindowRect (&rect, GetWindowLong (hwnd, GWL_STYLE), |
13434 | 5036 GetMenu (hwnd) != NULL); |
5037 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5038 /* Force width and height of client area to be exact |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5039 multiples of the character cell dimensions. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5040 wdiff = (lppos->cx - (rect.right - rect.left) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5041 - 2 * internal_border - scrollbar_extra) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5042 % font_width; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5043 hdiff = (lppos->cy - (rect.bottom - rect.top) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5044 - 2 * internal_border) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5045 % line_height; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5046 |
13434 | 5047 if (wdiff || hdiff) |
5048 { | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5049 /* For right/bottom sizing we can just fix the sizes. |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5050 However for top/left sizing we will need to fix the X |
13434 | 5051 and Y positions as well. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5052 |
13434 | 5053 lppos->cx -= wdiff; |
5054 lppos->cy -= hdiff; | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5055 |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5056 if (wp.showCmd != SW_SHOWMAXIMIZED |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5057 && (lppos->flags & SWP_NOMOVE) == 0) |
13434 | 5058 { |
5059 if (lppos->x != wr.left || lppos->y != wr.top) | |
5060 { | |
5061 lppos->x += wdiff; | |
5062 lppos->y += hdiff; | |
5063 } | |
5064 else | |
5065 { | |
5066 lppos->flags |= SWP_NOMOVE; | |
5067 } | |
5068 } | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5069 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5070 return 0; |
13434 | 5071 } |
5072 } | |
5073 } | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5074 |
13434 | 5075 goto dflt; |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5076 |
24479
3b2c3636bf0e
(w32_wnd_proc): Handle WM_GETMINMAXINFO message.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24412
diff
changeset
|
5077 case WM_GETMINMAXINFO: |
3b2c3636bf0e
(w32_wnd_proc): Handle WM_GETMINMAXINFO message.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24412
diff
changeset
|
5078 /* Hack to correct bug that allows Emacs frames to be resized |
3b2c3636bf0e
(w32_wnd_proc): Handle WM_GETMINMAXINFO message.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24412
diff
changeset
|
5079 below the Minimum Tracking Size. */ |
3b2c3636bf0e
(w32_wnd_proc): Handle WM_GETMINMAXINFO message.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24412
diff
changeset
|
5080 ((LPMINMAXINFO) lParam)->ptMinTrackSize.y++; |
36080
743534626f73
(w32_wnd_proc) <WM_GETMINMAXINFO>: Allow resizing the
Andrew Innes <andrewi@gnu.org>
parents:
36000
diff
changeset
|
5081 /* Hack to allow resizing the Emacs frame above the screen size. |
743534626f73
(w32_wnd_proc) <WM_GETMINMAXINFO>: Allow resizing the
Andrew Innes <andrewi@gnu.org>
parents:
36000
diff
changeset
|
5082 Note that Windows 9x limits coordinates to 16-bits. */ |
743534626f73
(w32_wnd_proc) <WM_GETMINMAXINFO>: Allow resizing the
Andrew Innes <andrewi@gnu.org>
parents:
36000
diff
changeset
|
5083 ((LPMINMAXINFO) lParam)->ptMaxTrackSize.x = 32767; |
743534626f73
(w32_wnd_proc) <WM_GETMINMAXINFO>: Allow resizing the
Andrew Innes <andrewi@gnu.org>
parents:
36000
diff
changeset
|
5084 ((LPMINMAXINFO) lParam)->ptMaxTrackSize.y = 32767; |
24479
3b2c3636bf0e
(w32_wnd_proc): Handle WM_GETMINMAXINFO message.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24412
diff
changeset
|
5085 return 0; |
3b2c3636bf0e
(w32_wnd_proc): Handle WM_GETMINMAXINFO message.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24412
diff
changeset
|
5086 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5087 case WM_EMACS_CREATESCROLLBAR: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5088 return (LRESULT) w32_createscrollbar ((struct frame *) wParam, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5089 (struct scroll_bar *) lParam); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5090 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5091 case WM_EMACS_SHOWWINDOW: |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5092 return ShowWindow ((HWND) wParam, (WPARAM) lParam); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5093 |
21608
d191a8737145
(w32_msg_pump): Handle WM_EMACS_SETLOCALE.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19707
diff
changeset
|
5094 case WM_EMACS_SETFOREGROUND: |
24718
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5095 { |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5096 HWND foreground_window; |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5097 DWORD foreground_thread, retval; |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5098 |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5099 /* On NT 5.0, and apparently Windows 98, it is necessary to |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5100 attach to the thread that currently has focus in order to |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5101 pull the focus away from it. */ |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5102 foreground_window = GetForegroundWindow (); |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5103 foreground_thread = GetWindowThreadProcessId (foreground_window, NULL); |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5104 if (!foreground_window |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5105 || foreground_thread == GetCurrentThreadId () |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5106 || !AttachThreadInput (GetCurrentThreadId (), |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5107 foreground_thread, TRUE)) |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5108 foreground_thread = 0; |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5109 |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5110 retval = SetForegroundWindow ((HWND) wParam); |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5111 |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5112 /* Detach from the previous foreground thread. */ |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5113 if (foreground_thread) |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5114 AttachThreadInput (GetCurrentThreadId (), |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5115 foreground_thread, FALSE); |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5116 |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5117 return retval; |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5118 } |
21608
d191a8737145
(w32_msg_pump): Handle WM_EMACS_SETLOCALE.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19707
diff
changeset
|
5119 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5120 case WM_EMACS_SETWINDOWPOS: |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5121 { |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5122 WINDOWPOS * pos = (WINDOWPOS *) wParam; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5123 return SetWindowPos (hwnd, pos->hwndInsertAfter, |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5124 pos->x, pos->y, pos->cx, pos->cy, pos->flags); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5125 } |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5126 |
13434 | 5127 case WM_EMACS_DESTROYWINDOW: |
21884 | 5128 DragAcceptFiles ((HWND) wParam, FALSE); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5129 return DestroyWindow ((HWND) wParam); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5130 |
42865
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5131 case WM_EMACS_HIDE_CARET: |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5132 return HideCaret (hwnd); |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5133 |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5134 case WM_EMACS_SHOW_CARET: |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5135 return ShowCaret (hwnd); |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5136 |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
5137 case WM_EMACS_DESTROY_CARET: |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
5138 w32_system_caret_hwnd = NULL; |
42865
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5139 w32_visible_system_caret_hwnd = NULL; |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
5140 return DestroyCaret (); |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
5141 |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
5142 case WM_EMACS_TRACK_CARET: |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
5143 /* If there is currently no system caret, create one. */ |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
5144 if (w32_system_caret_hwnd == NULL) |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
5145 { |
42865
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5146 /* Use the default caret width, and avoid changing it |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5147 unneccesarily, as it confuses screen reader software. */ |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
5148 w32_system_caret_hwnd = hwnd; |
42865
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5149 CreateCaret (hwnd, NULL, 0, |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
5150 w32_system_caret_height); |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
5151 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5152 |
42865
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5153 if (!SetCaretPos (w32_system_caret_x, w32_system_caret_y)) |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5154 return 0; |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5155 /* Ensure visible caret gets turned on when requested. */ |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5156 else if (w32_use_visible_system_caret |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5157 && w32_visible_system_caret_hwnd != hwnd) |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5158 { |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5159 w32_visible_system_caret_hwnd = hwnd; |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5160 return ShowCaret (hwnd); |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5161 } |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5162 /* Ensure visible caret gets turned off when requested. */ |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5163 else if (!w32_use_visible_system_caret |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5164 && w32_visible_system_caret_hwnd) |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5165 { |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5166 w32_visible_system_caret_hwnd = NULL; |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5167 return HideCaret (hwnd); |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5168 } |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5169 else |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
5170 return 1; |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
5171 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5172 case WM_EMACS_TRACKPOPUPMENU: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5173 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5174 UINT flags; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5175 POINT *pos; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5176 int retval; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5177 pos = (POINT *)lParam; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5178 flags = TPM_CENTERALIGN; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5179 if (button_state & LMOUSE) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5180 flags |= TPM_LEFTBUTTON; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5181 else if (button_state & RMOUSE) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5182 flags |= TPM_RIGHTBUTTON; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5183 |
21735
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
5184 /* Remember we did a SetCapture on the initial mouse down event, |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
5185 so for safety, we make sure the capture is cancelled now. */ |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
5186 ReleaseCapture (); |
23160
95a213639589
(w32_wnd_proc): Always zero button_state when releasing
Geoff Voelker <voelker@cs.washington.edu>
parents:
22625
diff
changeset
|
5187 button_state = 0; |
21735
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
5188 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5189 /* Use menubar_active to indicate that WM_INITMENU is from |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5190 TrackPopupMenu below, and should be ignored. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5191 f = x_window_to_frame (dpyinfo, hwnd); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5192 if (f) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5193 f->output_data.w32->menubar_active = 1; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5194 |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5195 if (TrackPopupMenu ((HMENU)wParam, flags, pos->x, pos->y, |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5196 0, hwnd, NULL)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5197 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5198 MSG amsg; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5199 /* Eat any mouse messages during popupmenu */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5200 while (PeekMessage (&amsg, hwnd, WM_MOUSEFIRST, WM_MOUSELAST, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5201 PM_REMOVE)); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5202 /* Get the menu selection, if any */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5203 if (PeekMessage (&amsg, hwnd, WM_COMMAND, WM_COMMAND, PM_REMOVE)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5204 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5205 retval = LOWORD (amsg.wParam); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5206 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5207 else |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5208 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5209 retval = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5210 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5211 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5212 else |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5213 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5214 retval = -1; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5215 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5216 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5217 return retval; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5218 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5219 |
13434 | 5220 default: |
21874
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
5221 /* Check for messages registered at runtime. */ |
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
5222 if (msg == msh_mousewheel) |
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
5223 { |
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
5224 wmsg.dwModifiers = w32_get_modifiers (); |
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
5225 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
5226 return 0; |
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
5227 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5228 |
13434 | 5229 dflt: |
5230 return DefWindowProc (hwnd, msg, wParam, lParam); | |
5231 } | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5232 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5233 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5234 /* The most common default return code for handled messages is 0. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5235 return 0; |
13434 | 5236 } |
5237 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5238 void |
13434 | 5239 my_create_window (f) |
5240 struct frame * f; | |
5241 { | |
5242 MSG msg; | |
5243 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5244 if (!PostThreadMessage (dwWindowsThreadId, WM_EMACS_CREATEWINDOW, (WPARAM)f, 0)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5245 abort (); |
13434 | 5246 GetMessage (&msg, NULL, WM_EMACS_DONE, WM_EMACS_DONE); |
5247 } | |
5248 | |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5249 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5250 /* Create a tooltip window. Unlike my_create_window, we do not do this |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5251 indirectly via the Window thread, as we do not need to process Window |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5252 messages for the tooltip. Creating tooltips indirectly also creates |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5253 deadlocks when tooltips are created for menu items. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5254 void |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5255 my_create_tip_window (f) |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5256 struct frame *f; |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5257 { |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5258 RECT rect; |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5259 |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5260 rect.left = rect.top = 0; |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5261 rect.right = PIXEL_WIDTH (f); |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5262 rect.bottom = PIXEL_HEIGHT (f); |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5263 |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5264 AdjustWindowRect (&rect, f->output_data.w32->dwStyle, |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5265 FRAME_EXTERNAL_MENU_BAR (f)); |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5266 |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5267 tip_window = FRAME_W32_WINDOW (f) |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5268 = CreateWindow (EMACS_CLASS, |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5269 f->namebuf, |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5270 f->output_data.w32->dwStyle, |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5271 f->output_data.w32->left_pos, |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5272 f->output_data.w32->top_pos, |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5273 rect.right - rect.left, |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5274 rect.bottom - rect.top, |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5275 FRAME_W32_WINDOW (SELECTED_FRAME ()), /* owner */ |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5276 NULL, |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5277 hinst, |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5278 NULL); |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5279 |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5280 if (tip_window) |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5281 { |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5282 SetWindowLong (tip_window, WND_FONTWIDTH_INDEX, FONT_WIDTH (f->output_data.w32->font)); |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5283 SetWindowLong (tip_window, WND_LINEHEIGHT_INDEX, f->output_data.w32->line_height); |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5284 SetWindowLong (tip_window, WND_BORDER_INDEX, f->output_data.w32->internal_border_width); |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5285 SetWindowLong (tip_window, WND_BACKGROUND_INDEX, FRAME_BACKGROUND_PIXEL (f)); |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5286 |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5287 /* Tip frames have no scrollbars. */ |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5288 SetWindowLong (tip_window, WND_SCROLLBAR_INDEX, 0); |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5289 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5290 /* Do this to discard the default setting specified by our parent. */ |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
5291 ShowWindow (tip_window, SW_HIDE); |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5292 } |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5293 } |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5294 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
5295 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5296 /* Create and set up the w32 window for frame F. */ |
13434 | 5297 |
5298 static void | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5299 w32_window (f, window_prompting, minibuffer_only) |
13434 | 5300 struct frame *f; |
5301 long window_prompting; | |
5302 int minibuffer_only; | |
5303 { | |
5304 BLOCK_INPUT; | |
5305 | |
5306 /* Use the resource name as the top-level window name | |
5307 for looking up resources. Make a non-Lisp copy | |
5308 for the window manager, so GC relocation won't bother it. | |
5309 | |
5310 Elsewhere we specify the window name for the window manager. */ | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5311 |
13434 | 5312 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5313 char *str = (char *) SDATA (Vx_resource_name); |
13434 | 5314 f->namebuf = (char *) xmalloc (strlen (str) + 1); |
5315 strcpy (f->namebuf, str); | |
5316 } | |
5317 | |
5318 my_create_window (f); | |
5319 | |
5320 validate_x_resource_name (); | |
5321 | |
5322 /* x_set_name normally ignores requests to set the name if the | |
5323 requested name is the same as the current name. This is the one | |
5324 place where that assumption isn't correct; f->name is set, but | |
5325 the server hasn't been told. */ | |
5326 { | |
5327 Lisp_Object name; | |
5328 int explicit = f->explicit_name; | |
5329 | |
5330 f->explicit_name = 0; | |
5331 name = f->name; | |
5332 f->name = Qnil; | |
5333 x_set_name (f, name, explicit); | |
5334 } | |
5335 | |
5336 UNBLOCK_INPUT; | |
5337 | |
5338 if (!minibuffer_only && FRAME_EXTERNAL_MENU_BAR (f)) | |
5339 initialize_frame_menubar (f); | |
5340 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5341 if (FRAME_W32_WINDOW (f) == 0) |
13434 | 5342 error ("Unable to create window"); |
5343 } | |
5344 | |
5345 /* Handle the icon stuff for this window. Perhaps later we might | |
5346 want an x_set_icon_position which can be called interactively as | |
5347 well. */ | |
5348 | |
5349 static void | |
5350 x_icon (f, parms) | |
5351 struct frame *f; | |
5352 Lisp_Object parms; | |
5353 { | |
5354 Lisp_Object icon_x, icon_y; | |
5355 | |
16884
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16602
diff
changeset
|
5356 /* Set the position of the icon. Note that Windows 95 groups all |
13434 | 5357 icons in the tray. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5358 icon_x = w32_get_arg (parms, Qicon_left, 0, 0, RES_TYPE_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5359 icon_y = w32_get_arg (parms, Qicon_top, 0, 0, RES_TYPE_NUMBER); |
13434 | 5360 if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound)) |
5361 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
5362 CHECK_NUMBER (icon_x); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
5363 CHECK_NUMBER (icon_y); |
13434 | 5364 } |
5365 else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound)) | |
5366 error ("Both left and top icon corners of icon must be specified"); | |
5367 | |
5368 BLOCK_INPUT; | |
5369 | |
5370 if (! EQ (icon_x, Qunbound)) | |
5371 x_wm_set_icon_position (f, XINT (icon_x), XINT (icon_y)); | |
5372 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5373 #if 0 /* TODO */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5374 /* Start up iconic or window? */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5375 x_wm_set_window_state |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5376 (f, (EQ (w32_get_arg (parms, Qvisibility, 0, 0, RES_TYPE_SYMBOL), Qicon) |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5377 ? IconicState |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5378 : NormalState)); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5379 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5380 x_text_icon (f, (char *) SDATA ((!NILP (f->icon_name) |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5381 ? f->icon_name |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5382 : f->name))); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5383 #endif |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5384 |
13434 | 5385 UNBLOCK_INPUT; |
5386 } | |
5387 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5388 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5389 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5390 x_make_gc (f) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5391 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5392 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5393 XGCValues gc_values; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5394 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5395 BLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5396 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5397 /* Create the GC's of this frame. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5398 Note that many default values are used. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5399 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5400 /* Normal video */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5401 gc_values.font = f->output_data.w32->font; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5402 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5403 /* Cursor has cursor-color background, background-color foreground. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5404 gc_values.foreground = FRAME_BACKGROUND_PIXEL (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5405 gc_values.background = f->output_data.w32->cursor_pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5406 f->output_data.w32->cursor_gc |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5407 = XCreateGC (NULL, FRAME_W32_WINDOW (f), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5408 (GCFont | GCForeground | GCBackground), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5409 &gc_values); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5410 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5411 /* Reliefs. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5412 f->output_data.w32->white_relief.gc = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5413 f->output_data.w32->black_relief.gc = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5414 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5415 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5416 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5417 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5418 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5419 /* Handler for signals raised during x_create_frame and |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5420 x_create_top_frame. FRAME is the frame which is partially |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5421 constructed. */ |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5422 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5423 static Lisp_Object |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5424 unwind_create_frame (frame) |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5425 Lisp_Object frame; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5426 { |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5427 struct frame *f = XFRAME (frame); |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5428 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5429 /* If frame is ``official'', nothing to do. */ |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5430 if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame)) |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5431 { |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5432 #ifdef GLYPH_DEBUG |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5433 struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5434 #endif |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5435 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5436 x_free_frame_resources (f); |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5437 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5438 /* Check that reference counts are indeed correct. */ |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5439 xassert (dpyinfo->reference_count == dpyinfo_refcount); |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5440 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:
34546
diff
changeset
|
5441 |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
5442 return Qt; |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5443 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5444 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5445 return Qnil; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5446 } |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5447 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5448 |
13434 | 5449 DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, |
5450 1, 1, 0, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
5451 doc: /* Make a new window, which is called a \"frame\" in Emacs terms. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
5452 Returns an Emacs frame object. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
5453 ALIST is an alist of frame parameters. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
5454 If the parameters specify that the frame should not have a minibuffer, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
5455 and do not specify a specific minibuffer window to use, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
5456 then `default-minibuffer-frame' must be a frame whose minibuffer can |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
5457 be shared by the new frame. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
5458 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
5459 This function is an internal primitive--use `make-frame' instead. */) |
13434 | 5460 (parms) |
5461 Lisp_Object parms; | |
5462 { | |
5463 struct frame *f; | |
5464 Lisp_Object frame, tem; | |
5465 Lisp_Object name; | |
5466 int minibuffer_only = 0; | |
5467 long window_prompting = 0; | |
5468 int width, height; | |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46272
diff
changeset
|
5469 int count = SPECPDL_INDEX (); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5470 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
13434 | 5471 Lisp_Object display; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5472 struct w32_display_info *dpyinfo = NULL; |
13434 | 5473 Lisp_Object parent; |
5474 struct kboard *kb; | |
5475 | |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5476 check_w32 (); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5477 |
13434 | 5478 /* Use this general default value to start with |
5479 until we know if this frame has a specified name. */ | |
5480 Vx_resource_name = Vinvocation_name; | |
5481 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5482 display = w32_get_arg (parms, Qdisplay, 0, 0, RES_TYPE_STRING); |
13434 | 5483 if (EQ (display, Qunbound)) |
5484 display = Qnil; | |
5485 dpyinfo = check_x_display_info (display); | |
5486 #ifdef MULTI_KBOARD | |
5487 kb = dpyinfo->kboard; | |
5488 #else | |
5489 kb = &the_only_kboard; | |
5490 #endif | |
5491 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5492 name = w32_get_arg (parms, Qname, "name", "Name", RES_TYPE_STRING); |
13434 | 5493 if (!STRINGP (name) |
5494 && ! EQ (name, Qunbound) | |
5495 && ! NILP (name)) | |
5496 error ("Invalid frame name--not a string or nil"); | |
5497 | |
5498 if (STRINGP (name)) | |
5499 Vx_resource_name = name; | |
5500 | |
5501 /* See if parent window is specified. */ | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5502 parent = w32_get_arg (parms, Qparent_id, NULL, NULL, RES_TYPE_NUMBER); |
13434 | 5503 if (EQ (parent, Qunbound)) |
5504 parent = Qnil; | |
5505 if (! NILP (parent)) | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
5506 CHECK_NUMBER (parent); |
13434 | 5507 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5508 /* make_frame_without_minibuffer can run Lisp code and garbage collect. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5509 /* No need to protect DISPLAY because that's not used after passing |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5510 it to make_frame_without_minibuffer. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5511 frame = Qnil; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5512 GCPRO4 (parms, parent, name, frame); |
32669
092d2df2a6c3
(Fx_create_frame): Don't bother calling
Jason Rumney <jasonr@gnu.org>
parents:
31110
diff
changeset
|
5513 tem = w32_get_arg (parms, Qminibuffer, "minibuffer", "Minibuffer", |
092d2df2a6c3
(Fx_create_frame): Don't bother calling
Jason Rumney <jasonr@gnu.org>
parents:
31110
diff
changeset
|
5514 RES_TYPE_SYMBOL); |
13434 | 5515 if (EQ (tem, Qnone) || NILP (tem)) |
5516 f = make_frame_without_minibuffer (Qnil, kb, display); | |
5517 else if (EQ (tem, Qonly)) | |
5518 { | |
5519 f = make_minibuffer_frame (); | |
5520 minibuffer_only = 1; | |
5521 } | |
5522 else if (WINDOWP (tem)) | |
5523 f = make_frame_without_minibuffer (tem, kb, display); | |
5524 else | |
5525 f = make_frame (1); | |
5526 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5527 XSETFRAME (frame, f); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5528 |
13434 | 5529 /* Note that Windows does support scroll bars. */ |
5530 FRAME_CAN_HAVE_SCROLL_BARS (f) = 1; | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5531 /* By default, make scrollbars the system standard width. */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5532 f->scroll_bar_pixel_width = GetSystemMetrics (SM_CXVSCROLL); |
13434 | 5533 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5534 f->output_method = output_w32; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5535 f->output_data.w32 = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5536 (struct w32_output *) xmalloc (sizeof (struct w32_output)); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5537 bzero (f->output_data.w32, sizeof (struct w32_output)); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5538 FRAME_FONTSET (f) = -1; |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
5539 record_unwind_protect (unwind_create_frame, frame); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5540 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5541 f->icon_name |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5542 = w32_get_arg (parms, Qicon_name, "iconName", "Title", RES_TYPE_STRING); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5543 if (! STRINGP (f->icon_name)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5544 f->icon_name = Qnil; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5545 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5546 /* FRAME_W32_DISPLAY_INFO (f) = dpyinfo; */ |
13434 | 5547 #ifdef MULTI_KBOARD |
5548 FRAME_KBOARD (f) = kb; | |
5549 #endif | |
5550 | |
5551 /* Specify the parent under which to make this window. */ | |
5552 | |
5553 if (!NILP (parent)) | |
5554 { | |
32669
092d2df2a6c3
(Fx_create_frame): Don't bother calling
Jason Rumney <jasonr@gnu.org>
parents:
31110
diff
changeset
|
5555 f->output_data.w32->parent_desc = (Window) XFASTINT (parent); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5556 f->output_data.w32->explicit_parent = 1; |
13434 | 5557 } |
5558 else | |
5559 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5560 f->output_data.w32->parent_desc = FRAME_W32_DISPLAY_INFO (f)->root_window; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5561 f->output_data.w32->explicit_parent = 0; |
13434 | 5562 } |
5563 | |
5564 /* Set the name; the functions to which we pass f expect the name to | |
5565 be set. */ | |
5566 if (EQ (name, Qunbound) || NILP (name)) | |
5567 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5568 f->name = build_string (dpyinfo->w32_id_name); |
13434 | 5569 f->explicit_name = 0; |
5570 } | |
5571 else | |
5572 { | |
5573 f->name = name; | |
5574 f->explicit_name = 1; | |
5575 /* use the frame's title when getting resources for this frame. */ | |
5576 specbind (Qx_resource_name, name); | |
5577 } | |
5578 | |
5579 /* Extract the window parameters from the supplied values | |
5580 that are needed to determine window geometry. */ | |
5581 { | |
5582 Lisp_Object font; | |
5583 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5584 font = w32_get_arg (parms, Qfont, "font", "Font", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5585 |
13434 | 5586 BLOCK_INPUT; |
5587 /* First, try whatever font the caller has specified. */ | |
5588 if (STRINGP (font)) | |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5589 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5590 tem = Fquery_fontset (font, Qnil); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5591 if (STRINGP (tem)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5592 font = x_new_fontset (f, SDATA (tem)); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5593 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5594 font = x_new_font (f, SDATA (font)); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5595 } |
13434 | 5596 /* Try out a font which we hope has bold and italic variations. */ |
5597 if (!STRINGP (font)) | |
32977
d0421102ed8c
(Fx_create_frame): Make default fontsize on w32 10 point, as Windows
Jason Rumney <jasonr@gnu.org>
parents:
32791
diff
changeset
|
5598 font = x_new_font (f, "-*-Courier New-normal-r-*-*-*-100-*-*-c-*-iso8859-1"); |
13434 | 5599 if (! STRINGP (font)) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5600 font = x_new_font (f, "-*-Courier-normal-r-*-*-13-*-*-*-c-*-iso8859-1"); |
13434 | 5601 /* If those didn't work, look for something which will at least work. */ |
5602 if (! STRINGP (font)) | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5603 font = x_new_font (f, "-*-Fixedsys-normal-r-*-*-12-*-*-*-c-*-iso8859-1"); |
13434 | 5604 UNBLOCK_INPUT; |
5605 if (! STRINGP (font)) | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5606 font = build_string ("Fixedsys"); |
13434 | 5607 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5608 x_default_parameter (f, parms, Qfont, font, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5609 "font", "Font", RES_TYPE_STRING); |
13434 | 5610 } |
5611 | |
5612 x_default_parameter (f, parms, Qborder_width, make_number (2), | |
32669
092d2df2a6c3
(Fx_create_frame): Don't bother calling
Jason Rumney <jasonr@gnu.org>
parents:
31110
diff
changeset
|
5613 "borderWidth", "BorderWidth", RES_TYPE_NUMBER); |
13434 | 5614 /* This defaults to 2 in order to match xterm. We recognize either |
5615 internalBorderWidth or internalBorder (which is what xterm calls | |
5616 it). */ | |
5617 if (NILP (Fassq (Qinternal_border_width, parms))) | |
5618 { | |
5619 Lisp_Object value; | |
5620 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5621 value = w32_get_arg (parms, Qinternal_border_width, |
32669
092d2df2a6c3
(Fx_create_frame): Don't bother calling
Jason Rumney <jasonr@gnu.org>
parents:
31110
diff
changeset
|
5622 "internalBorder", "InternalBorder", RES_TYPE_NUMBER); |
13434 | 5623 if (! EQ (value, Qunbound)) |
5624 parms = Fcons (Fcons (Qinternal_border_width, value), | |
5625 parms); | |
5626 } | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5627 /* Default internalBorderWidth to 0 on Windows to match other programs. */ |
13434 | 5628 x_default_parameter (f, parms, Qinternal_border_width, make_number (0), |
32669
092d2df2a6c3
(Fx_create_frame): Don't bother calling
Jason Rumney <jasonr@gnu.org>
parents:
31110
diff
changeset
|
5629 "internalBorderWidth", "InternalBorder", RES_TYPE_NUMBER); |
092d2df2a6c3
(Fx_create_frame): Don't bother calling
Jason Rumney <jasonr@gnu.org>
parents:
31110
diff
changeset
|
5630 x_default_parameter (f, parms, Qvertical_scroll_bars, Qright, |
092d2df2a6c3
(Fx_create_frame): Don't bother calling
Jason Rumney <jasonr@gnu.org>
parents:
31110
diff
changeset
|
5631 "verticalScrollBars", "ScrollBars", RES_TYPE_SYMBOL); |
13434 | 5632 |
5633 /* Also do the stuff which must be set before the window exists. */ | |
5634 x_default_parameter (f, parms, Qforeground_color, build_string ("black"), | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5635 "foreground", "Foreground", RES_TYPE_STRING); |
13434 | 5636 x_default_parameter (f, parms, Qbackground_color, build_string ("white"), |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5637 "background", "Background", RES_TYPE_STRING); |
13434 | 5638 x_default_parameter (f, parms, Qmouse_color, build_string ("black"), |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5639 "pointerColor", "Foreground", RES_TYPE_STRING); |
13434 | 5640 x_default_parameter (f, parms, Qcursor_color, build_string ("black"), |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5641 "cursorColor", "Foreground", RES_TYPE_STRING); |
13434 | 5642 x_default_parameter (f, parms, Qborder_color, build_string ("black"), |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5643 "borderColor", "BorderColor", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5644 x_default_parameter (f, parms, Qscreen_gamma, Qnil, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5645 "screenGamma", "ScreenGamma", RES_TYPE_FLOAT); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5646 x_default_parameter (f, parms, Qline_spacing, Qnil, |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5647 "lineSpacing", "LineSpacing", RES_TYPE_NUMBER); |
41726
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
5648 x_default_parameter (f, parms, Qleft_fringe, Qnil, |
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
5649 "leftFringe", "LeftFringe", RES_TYPE_NUMBER); |
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
5650 x_default_parameter (f, parms, Qright_fringe, Qnil, |
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
5651 "rightFringe", "RightFringe", RES_TYPE_NUMBER); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5652 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5653 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5654 /* Init faces before x_default_parameter is called for scroll-bar |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5655 parameters because that function calls x_set_scroll_bar_width, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5656 which calls change_frame_size, which calls Fset_window_buffer, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5657 which runs hooks, which call Fvertical_motion. At the end, we |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5658 end up in init_iterator with a null face cache, which should not |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5659 happen. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5660 init_frame_faces (f); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5661 |
13434 | 5662 x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1), |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5663 "menuBar", "MenuBar", RES_TYPE_NUMBER); |
44097
e3dca9179494
(Fx_create_frame): Enable tool-bar when images are supported.
Jason Rumney <jasonr@gnu.org>
parents:
44094
diff
changeset
|
5664 x_default_parameter (f, parms, Qtool_bar_lines, make_number (1), |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5665 "toolBar", "ToolBar", RES_TYPE_NUMBER); |
44109
b615e4daf825
[HAVE_IMAGES, HAVE_PBM]: Remove conditionals.
Jason Rumney <jasonr@gnu.org>
parents:
44097
diff
changeset
|
5666 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5667 x_default_parameter (f, parms, Qbuffer_predicate, Qnil, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5668 "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5669 x_default_parameter (f, parms, Qtitle, Qnil, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5670 "title", "Title", RES_TYPE_STRING); |
43398 | 5671 x_default_parameter (f, parms, Qfullscreen, Qnil, |
5672 "fullscreen", "Fullscreen", RES_TYPE_SYMBOL); | |
13434 | 5673 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5674 f->output_data.w32->dwStyle = WS_OVERLAPPEDWINDOW; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5675 f->output_data.w32->parent_desc = FRAME_W32_DISPLAY_INFO (f)->root_window; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5676 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5677 /* Add the tool-bar height to the initial frame height so that the |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5678 user gets a text display area of the size he specified with -g or |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5679 via .Xdefaults. Later changes of the tool-bar height don't |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5680 change the frame size. This is done so that users can create |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5681 tall Emacs frames without having to guess how tall the tool-bar |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5682 will get. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5683 if (FRAME_TOOL_BAR_LINES (f)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5684 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5685 int margin, relief, bar_height; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5686 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
5687 relief = (tool_bar_button_relief >= 0 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5688 ? tool_bar_button_relief |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5689 : DEFAULT_TOOL_BAR_BUTTON_RELIEF); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5690 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5691 if (INTEGERP (Vtool_bar_button_margin) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5692 && XINT (Vtool_bar_button_margin) > 0) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5693 margin = XFASTINT (Vtool_bar_button_margin); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5694 else if (CONSP (Vtool_bar_button_margin) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5695 && INTEGERP (XCDR (Vtool_bar_button_margin)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5696 && XINT (XCDR (Vtool_bar_button_margin)) > 0) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5697 margin = XFASTINT (XCDR (Vtool_bar_button_margin)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5698 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5699 margin = 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5700 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5701 bar_height = DEFAULT_TOOL_BAR_IMAGE_HEIGHT + 2 * margin + 2 * relief; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5702 f->height += (bar_height + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5703 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
5704 |
13434 | 5705 window_prompting = x_figure_window_size (f, parms); |
5706 | |
5707 if (window_prompting & XNegative) | |
5708 { | |
5709 if (window_prompting & YNegative) | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5710 f->output_data.w32->win_gravity = SouthEastGravity; |
13434 | 5711 else |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5712 f->output_data.w32->win_gravity = NorthEastGravity; |
13434 | 5713 } |
5714 else | |
5715 { | |
5716 if (window_prompting & YNegative) | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5717 f->output_data.w32->win_gravity = SouthWestGravity; |
13434 | 5718 else |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5719 f->output_data.w32->win_gravity = NorthWestGravity; |
13434 | 5720 } |
5721 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5722 f->output_data.w32->size_hint_flags = window_prompting; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5723 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5724 tem = w32_get_arg (parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5725 f->no_split = minibuffer_only || EQ (tem, Qt); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5726 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5727 w32_window (f, window_prompting, minibuffer_only); |
13434 | 5728 x_icon (f, parms); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5729 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5730 x_make_gc (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5731 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5732 /* Now consider the frame official. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5733 FRAME_W32_DISPLAY_INFO (f)->reference_count++; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5734 Vframe_list = Fcons (frame, Vframe_list); |
13434 | 5735 |
5736 /* We need to do this after creating the window, so that the | |
5737 icon-creation functions can say whose icon they're describing. */ | |
5738 x_default_parameter (f, parms, Qicon_type, Qnil, | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5739 "bitmapIcon", "BitmapIcon", RES_TYPE_SYMBOL); |
13434 | 5740 |
5741 x_default_parameter (f, parms, Qauto_raise, Qnil, | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5742 "autoRaise", "AutoRaiseLower", RES_TYPE_BOOLEAN); |
13434 | 5743 x_default_parameter (f, parms, Qauto_lower, Qnil, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5744 "autoLower", "AutoRaiseLower", RES_TYPE_BOOLEAN); |
13434 | 5745 x_default_parameter (f, parms, Qcursor_type, Qbox, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5746 "cursorType", "CursorType", RES_TYPE_SYMBOL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5747 x_default_parameter (f, parms, Qscroll_bar_width, Qnil, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5748 "scrollBarWidth", "ScrollBarWidth", RES_TYPE_NUMBER); |
13434 | 5749 |
5750 /* Dimensions, especially f->height, must be done via change_frame_size. | |
5751 Change will not be effected unless different from the current | |
5752 f->height. */ | |
5753 width = f->width; | |
5754 height = f->height; | |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
5755 |
16259
f54af1701a5f
(Qright): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16106
diff
changeset
|
5756 f->height = 0; |
f54af1701a5f
(Qright): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16106
diff
changeset
|
5757 SET_FRAME_WIDTH (f, 0); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5758 change_frame_size (f, height, width, 1, 0, 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5759 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5760 /* Tell the server what size and position, etc, we want, and how |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5761 badly we want them. This should be done after we have the menu |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5762 bar so that its size can be taken into account. */ |
13434 | 5763 BLOCK_INPUT; |
5764 x_wm_set_size_hint (f, window_prompting, 0); | |
5765 UNBLOCK_INPUT; | |
5766 | |
42833
4510d4d4bac4
(Fx_create_frame): Bind redisplay-dont-pause around
Jason Rumney <jasonr@gnu.org>
parents:
42719
diff
changeset
|
5767 /* Avoid a bug that causes the new frame to never become visible if |
4510d4d4bac4
(Fx_create_frame): Bind redisplay-dont-pause around
Jason Rumney <jasonr@gnu.org>
parents:
42719
diff
changeset
|
5768 an echo area message is displayed during the following call1. */ |
4510d4d4bac4
(Fx_create_frame): Bind redisplay-dont-pause around
Jason Rumney <jasonr@gnu.org>
parents:
42719
diff
changeset
|
5769 specbind(Qredisplay_dont_pause, Qt); |
4510d4d4bac4
(Fx_create_frame): Bind redisplay-dont-pause around
Jason Rumney <jasonr@gnu.org>
parents:
42719
diff
changeset
|
5770 |
34133
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
5771 /* Set up faces after all frame parameters are known. This call |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
5772 also merges in face attributes specified for new frames. If we |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
5773 don't do this, the `menu' face for instance won't have the right |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
5774 colors, and the menu bar won't appear in the specified colors for |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
5775 new frames. */ |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
5776 call1 (Qface_set_after_frame_default, frame); |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
5777 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5778 /* Make the window appear on the frame and enable display, unless |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5779 the caller says not to. However, with explicit parent, Emacs |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5780 cannot control visibility, so don't try. */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5781 if (! f->output_data.w32->explicit_parent) |
13434 | 5782 { |
5783 Lisp_Object visibility; | |
5784 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5785 visibility = w32_get_arg (parms, Qvisibility, 0, 0, RES_TYPE_SYMBOL); |
13434 | 5786 if (EQ (visibility, Qunbound)) |
5787 visibility = Qt; | |
5788 | |
5789 if (EQ (visibility, Qicon)) | |
5790 x_iconify_frame (f); | |
5791 else if (! NILP (visibility)) | |
5792 x_make_frame_visible (f); | |
5793 else | |
5794 /* Must have been Qnil. */ | |
5795 ; | |
5796 } | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5797 UNGCPRO; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5798 |
36594
756c28377036
(Fx_create_frame): Clear Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
36312
diff
changeset
|
5799 /* 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:
36312
diff
changeset
|
5800 and similar functions. */ |
756c28377036
(Fx_create_frame): Clear Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
36312
diff
changeset
|
5801 Vwindow_list = Qnil; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5802 |
13434 | 5803 return unbind_to (count, frame); |
5804 } | |
5805 | |
5806 /* FRAME is used only to get a handle on the X display. We don't pass the | |
5807 display info directly because we're called from frame.c, which doesn't | |
5808 know about that structure. */ | |
5809 Lisp_Object | |
5810 x_get_focus_frame (frame) | |
5811 struct frame *frame; | |
5812 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5813 struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (frame); |
13434 | 5814 Lisp_Object xfocus; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5815 if (! dpyinfo->w32_focus_frame) |
13434 | 5816 return Qnil; |
5817 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5818 XSETFRAME (xfocus, dpyinfo->w32_focus_frame); |
13434 | 5819 return xfocus; |
5820 } | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5821 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5822 DEFUN ("w32-focus-frame", Fw32_focus_frame, Sw32_focus_frame, 1, 1, 0, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
5823 doc: /* Give FRAME input focus, raising to foreground if necessary. */) |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5824 (frame) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5825 Lisp_Object frame; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5826 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5827 x_focus_on_frame (check_x_frame (frame)); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5828 return Qnil; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5829 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
5830 |
13434 | 5831 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5832 /* Return the charset portion of a font name. */ |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5833 char * xlfd_charset_of_font (char * fontname) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5834 { |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5835 char *charset, *encoding; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5836 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5837 encoding = strrchr(fontname, '-'); |
34284
3a21ff35392b
(xlfd_charset_of_font): Don't overwrite fontname
Andrew Innes <andrewi@gnu.org>
parents:
34133
diff
changeset
|
5838 if (!encoding || encoding == fontname) |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5839 return NULL; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5840 |
34314
8318a4ea6764
(xlfd_charset_of_font): Fix last change.
Andrew Innes <andrewi@gnu.org>
parents:
34284
diff
changeset
|
5841 for (charset = encoding - 1; charset >= fontname; charset--) |
8318a4ea6764
(xlfd_charset_of_font): Fix last change.
Andrew Innes <andrewi@gnu.org>
parents:
34284
diff
changeset
|
5842 if (*charset == '-') |
8318a4ea6764
(xlfd_charset_of_font): Fix last change.
Andrew Innes <andrewi@gnu.org>
parents:
34284
diff
changeset
|
5843 break; |
8318a4ea6764
(xlfd_charset_of_font): Fix last change.
Andrew Innes <andrewi@gnu.org>
parents:
34284
diff
changeset
|
5844 |
8318a4ea6764
(xlfd_charset_of_font): Fix last change.
Andrew Innes <andrewi@gnu.org>
parents:
34284
diff
changeset
|
5845 if (charset == fontname || strcmp(charset, "-*-*") == 0) |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5846 return NULL; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5847 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5848 return charset + 1; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5849 } |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5850 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5851 struct font_info *w32_load_bdf_font (struct frame *f, char *fontname, |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5852 int size, char* filename); |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
5853 static Lisp_Object w32_list_bdf_fonts (Lisp_Object pattern, int max_names); |
37707
6bc1c4d4eb50
(w32_to_x_font): Change prototype to fit the declaration.
Eli Zaretskii <eliz@gnu.org>
parents:
36594
diff
changeset
|
5854 static BOOL w32_to_x_font (LOGFONT * lplf, char * lpxstr, int len, |
6bc1c4d4eb50
(w32_to_x_font): Change prototype to fit the declaration.
Eli Zaretskii <eliz@gnu.org>
parents:
36594
diff
changeset
|
5855 char * charset); |
6bc1c4d4eb50
(w32_to_x_font): Change prototype to fit the declaration.
Eli Zaretskii <eliz@gnu.org>
parents:
36594
diff
changeset
|
5856 static BOOL x_to_w32_font (char *lpxstr, LOGFONT *lplogfont); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5857 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
5858 static struct font_info * |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5859 w32_load_system_font (f,fontname,size) |
24670 | 5860 struct frame *f; |
5861 char * fontname; | |
5862 int size; | |
13434 | 5863 { |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5864 struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5865 Lisp_Object font_names; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5866 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5867 /* Get a list of all the fonts that match this name. Once we |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5868 have a list of matching fonts, we compare them against the fonts |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5869 we already have loaded by comparing names. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5870 font_names = w32_list_fonts (f, build_string (fontname), size, 100); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5871 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5872 if (!NILP (font_names)) |
14353 | 5873 { |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5874 Lisp_Object tail; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5875 int i; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5876 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5877 /* First check if any are already loaded, as that is cheaper |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5878 than loading another one. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5879 for (i = 0; i < dpyinfo->n_fonts; i++) |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
5880 for (tail = font_names; CONSP (tail); tail = XCDR (tail)) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5881 if (dpyinfo->font_table[i].name |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5882 && (!strcmp (dpyinfo->font_table[i].name, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5883 SDATA (XCAR (tail))) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5884 || !strcmp (dpyinfo->font_table[i].full_name, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5885 SDATA (XCAR (tail))))) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5886 return (dpyinfo->font_table + i); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5887 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5888 fontname = (char *) SDATA (XCAR (font_names)); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5889 } |
24481
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
5890 else if (w32_strict_fontnames) |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5891 { |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5892 /* If EnumFontFamiliesEx was available, we got a full list of |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5893 fonts back so stop now to avoid the possibility of loading a |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5894 random font. If we had to fall back to EnumFontFamilies, the |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5895 list is incomplete, so continue whether the font we want was |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5896 listed or not. */ |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5897 HMODULE gdi32 = GetModuleHandle ("gdi32.dll"); |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5898 FARPROC enum_font_families_ex |
24481
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
5899 = GetProcAddress (gdi32, "EnumFontFamiliesExA"); |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5900 if (enum_font_families_ex) |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5901 return NULL; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5902 } |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5903 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5904 /* Load the font and add it to the table. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5905 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5906 char *full_name, *encoding, *charset; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5907 XFontStruct *font; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5908 struct font_info *fontp; |
14353 | 5909 LOGFONT lf; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5910 BOOL ok; |
40009
f6ecf530f0a3
(w32_load_system_font): Cache codepage for font, in
Andrew Innes <andrewi@gnu.org>
parents:
39973
diff
changeset
|
5911 int codepage; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5912 int i; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5913 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5914 if (!fontname || !x_to_w32_font (fontname, &lf)) |
14353 | 5915 return (NULL); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5916 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5917 if (!*lf.lfFaceName) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5918 /* If no name was specified for the font, we get a random font |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5919 from CreateFontIndirect - this is not particularly |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5920 desirable, especially since CreateFontIndirect does not |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5921 fill out the missing name in lf, so we never know what we |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5922 ended up with. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5923 return NULL; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5924 |
48359
1e8497bc057d
(w32_load_system_font): Don't disable Cleartype.
Jason Rumney <jasonr@gnu.org>
parents:
48351
diff
changeset
|
5925 lf.lfQuality = DEFAULT_QUALITY; |
43210
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
5926 |
14353 | 5927 font = (XFontStruct *) xmalloc (sizeof (XFontStruct)); |
32721
0574ffc14f77
(w32_load_system_font): Call w32_cache_char_metrics.
Andrew Innes <andrewi@gnu.org>
parents:
32669
diff
changeset
|
5928 bzero (font, sizeof (*font)); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5929 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5930 /* Set bdf to NULL to indicate that this is a Windows font. */ |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5931 font->bdf = NULL; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5932 |
14353 | 5933 BLOCK_INPUT; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5934 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5935 font->hfont = CreateFontIndirect (&lf); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5936 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5937 if (font->hfont == NULL) |
23620
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5938 { |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5939 ok = FALSE; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5940 } |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5941 else |
23620
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5942 { |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5943 HDC hdc; |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5944 HANDLE oldobj; |
40009
f6ecf530f0a3
(w32_load_system_font): Cache codepage for font, in
Andrew Innes <andrewi@gnu.org>
parents:
39973
diff
changeset
|
5945 |
f6ecf530f0a3
(w32_load_system_font): Cache codepage for font, in
Andrew Innes <andrewi@gnu.org>
parents:
39973
diff
changeset
|
5946 codepage = w32_codepage_for_font (fontname); |
23620
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5947 |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5948 hdc = GetDC (dpyinfo->root_window); |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5949 oldobj = SelectObject (hdc, font->hfont); |
33929
886f1ee076bd
(w32_load_system_font): Always mark font as double byte if codepage is unicode.
Jason Rumney <jasonr@gnu.org>
parents:
33879
diff
changeset
|
5950 |
23620
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5951 ok = GetTextMetrics (hdc, &font->tm); |
33929
886f1ee076bd
(w32_load_system_font): Always mark font as double byte if codepage is unicode.
Jason Rumney <jasonr@gnu.org>
parents:
33879
diff
changeset
|
5952 if (codepage == CP_UNICODE) |
886f1ee076bd
(w32_load_system_font): Always mark font as double byte if codepage is unicode.
Jason Rumney <jasonr@gnu.org>
parents:
33879
diff
changeset
|
5953 font->double_byte_p = 1; |
886f1ee076bd
(w32_load_system_font): Always mark font as double byte if codepage is unicode.
Jason Rumney <jasonr@gnu.org>
parents:
33879
diff
changeset
|
5954 else |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5955 { |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5956 /* Unfortunately, some fonts (eg. MingLiU, a big5 ttf font) |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5957 don't report themselves as double byte fonts, when |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5958 patently they are. So instead of trusting |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5959 GetFontLanguageInfo, we check the properties of the |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5960 codepage directly, since that is ultimately what we are |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5961 working from anyway. */ |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5962 /* font->double_byte_p = GetFontLanguageInfo(hdc) & GCP_DBCS; */ |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5963 CPINFO cpi = {0}; |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5964 GetCPInfo (codepage, &cpi); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5965 font->double_byte_p = cpi.MaxCharSize > 1; |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5966 } |
33929
886f1ee076bd
(w32_load_system_font): Always mark font as double byte if codepage is unicode.
Jason Rumney <jasonr@gnu.org>
parents:
33879
diff
changeset
|
5967 |
23620
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5968 SelectObject (hdc, oldobj); |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5969 ReleaseDC (dpyinfo->root_window, hdc); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5970 /* Fill out details in lf according to the font that was |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5971 actually loaded. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5972 lf.lfHeight = font->tm.tmInternalLeading - font->tm.tmHeight; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5973 lf.lfWidth = font->tm.tmAveCharWidth; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5974 lf.lfWeight = font->tm.tmWeight; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5975 lf.lfItalic = font->tm.tmItalic; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5976 lf.lfCharSet = font->tm.tmCharSet; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5977 lf.lfPitchAndFamily = ((font->tm.tmPitchAndFamily & TMPF_FIXED_PITCH) |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5978 ? VARIABLE_PITCH : FIXED_PITCH); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5979 lf.lfOutPrecision = ((font->tm.tmPitchAndFamily & TMPF_VECTOR) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5980 ? OUT_STROKE_PRECIS : OUT_STRING_PRECIS); |
32721
0574ffc14f77
(w32_load_system_font): Call w32_cache_char_metrics.
Andrew Innes <andrewi@gnu.org>
parents:
32669
diff
changeset
|
5981 |
0574ffc14f77
(w32_load_system_font): Call w32_cache_char_metrics.
Andrew Innes <andrewi@gnu.org>
parents:
32669
diff
changeset
|
5982 w32_cache_char_metrics (font); |
23620
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5983 } |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5984 |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5985 UNBLOCK_INPUT; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5986 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5987 if (!ok) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5988 { |
23620
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5989 w32_unload_font (dpyinfo, font); |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5990 return (NULL); |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5991 } |
13434 | 5992 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5993 /* Find a free slot in the font table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5994 for (i = 0; i < dpyinfo->n_fonts; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5995 if (dpyinfo->font_table[i].name == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5996 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5997 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5998 /* If no free slot found, maybe enlarge the font table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5999 if (i == dpyinfo->n_fonts |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6000 && dpyinfo->n_fonts == dpyinfo->font_table_size) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6001 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6002 int sz; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6003 dpyinfo->font_table_size = max (16, 2 * dpyinfo->font_table_size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6004 sz = dpyinfo->font_table_size * sizeof *dpyinfo->font_table; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6005 dpyinfo->font_table |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6006 = (struct font_info *) xrealloc (dpyinfo->font_table, sz); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6007 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6008 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6009 fontp = dpyinfo->font_table + i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6010 if (i == dpyinfo->n_fonts) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6011 ++dpyinfo->n_fonts; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6012 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6013 /* Now fill in the slots of *FONTP. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6014 BLOCK_INPUT; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6015 fontp->font = font; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6016 fontp->font_idx = i; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6017 fontp->name = (char *) xmalloc (strlen (fontname) + 1); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6018 bcopy (fontname, fontp->name, strlen (fontname) + 1); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6019 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6020 charset = xlfd_charset_of_font (fontname); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6021 |
40009
f6ecf530f0a3
(w32_load_system_font): Cache codepage for font, in
Andrew Innes <andrewi@gnu.org>
parents:
39973
diff
changeset
|
6022 /* Cache the W32 codepage for a font. This makes w32_encode_char |
f6ecf530f0a3
(w32_load_system_font): Cache codepage for font, in
Andrew Innes <andrewi@gnu.org>
parents:
39973
diff
changeset
|
6023 (called for every glyph during redisplay) much faster. */ |
f6ecf530f0a3
(w32_load_system_font): Cache codepage for font, in
Andrew Innes <andrewi@gnu.org>
parents:
39973
diff
changeset
|
6024 fontp->codepage = codepage; |
f6ecf530f0a3
(w32_load_system_font): Cache codepage for font, in
Andrew Innes <andrewi@gnu.org>
parents:
39973
diff
changeset
|
6025 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6026 /* Work out the font's full name. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6027 full_name = (char *)xmalloc (100); |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6028 if (full_name && w32_to_x_font (&lf, full_name, 100, charset)) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6029 fontp->full_name = full_name; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6030 else |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6031 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6032 /* If all else fails - just use the name we used to load it. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6033 xfree (full_name); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6034 fontp->full_name = fontp->name; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6035 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6036 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6037 fontp->size = FONT_WIDTH (font); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6038 fontp->height = FONT_HEIGHT (font); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6039 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6040 /* The slot `encoding' specifies how to map a character |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6041 code-points (0x20..0x7F or 0x2020..0x7F7F) of each charset to |
28272
f62bb21d38db
(w32_wnd_proc): Handle WM_MENUSELECT message.
Jason Rumney <jasonr@gnu.org>
parents:
27936
diff
changeset
|
6042 the font code-points (0:0x20..0x7F, 1:0xA0..0xFF), or |
f62bb21d38db
(w32_wnd_proc): Handle WM_MENUSELECT message.
Jason Rumney <jasonr@gnu.org>
parents:
27936
diff
changeset
|
6043 (0:0x20..0x7F, 1:0xA0..0xFF, |
f62bb21d38db
(w32_wnd_proc): Handle WM_MENUSELECT message.
Jason Rumney <jasonr@gnu.org>
parents:
27936
diff
changeset
|
6044 (0:0x2020..0x7F7F, 1:0xA0A0..0xFFFF, 3:0x20A0..0x7FFF, |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6045 2:0xA020..0xFF7F). For the moment, we don't know which charset |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6046 uses this font. So, we set information in fontp->encoding[1] |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6047 which is never used by any charset. If mapping can't be |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6048 decided, set FONT_ENCODING_NOT_DECIDED. */ |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6049 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6050 /* SJIS fonts need to be set to type 4, all others seem to work as |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6051 type FONT_ENCODING_NOT_DECIDED. */ |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6052 encoding = strrchr (fontp->name, '-'); |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6053 if (encoding && strnicmp (encoding+1, "sjis", 4) == 0) |
24692
a0a2521b783d
(x_to_w32_charset): Fix typo: want to map all Japanese
Andrew Innes <andrewi@gnu.org>
parents:
24679
diff
changeset
|
6054 fontp->encoding[1] = 4; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6055 else |
24692
a0a2521b783d
(x_to_w32_charset): Fix typo: want to map all Japanese
Andrew Innes <andrewi@gnu.org>
parents:
24679
diff
changeset
|
6056 fontp->encoding[1] = FONT_ENCODING_NOT_DECIDED; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6057 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6058 /* The following three values are set to 0 under W32, which is |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6059 what they get set to if XGetFontProperty fails under X. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6060 fontp->baseline_offset = 0; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6061 fontp->relative_compose = 0; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6062 fontp->default_ascent = 0; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6063 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6064 /* Set global flag fonts_changed_p to non-zero if the font loaded |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6065 has a character with a smaller width than any other character |
43398 | 6066 before, or if the font loaded has a smaller height than any |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6067 other font loaded before. If this happens, it will make a |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6068 glyph matrix reallocation necessary. */ |
43398 | 6069 fonts_changed_p |= x_compute_min_glyph_bounds (f); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6070 UNBLOCK_INPUT; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6071 return fontp; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6072 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6073 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6074 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6075 /* Load font named FONTNAME of size SIZE for frame F, and return a |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6076 pointer to the structure font_info while allocating it dynamically. |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6077 If loading fails, return NULL. */ |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6078 struct font_info * |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6079 w32_load_font (f,fontname,size) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6080 struct frame *f; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6081 char * fontname; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6082 int size; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6083 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6084 Lisp_Object bdf_fonts; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6085 struct font_info *retval = NULL; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6086 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6087 bdf_fonts = w32_list_bdf_fonts (build_string (fontname), 1); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6088 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6089 while (!retval && CONSP (bdf_fonts)) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6090 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6091 char *bdf_name, *bdf_file; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6092 Lisp_Object bdf_pair; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6093 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6094 bdf_name = SDATA (XCAR (bdf_fonts)); |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6095 bdf_pair = Fassoc (XCAR (bdf_fonts), Vw32_bdf_filename_alist); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6096 bdf_file = SDATA (XCDR (bdf_pair)); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6097 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6098 retval = w32_load_bdf_font (f, bdf_name, size, bdf_file); |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6099 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6100 bdf_fonts = XCDR (bdf_fonts); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6101 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6102 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6103 if (retval) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6104 return retval; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6105 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6106 return w32_load_system_font(f, fontname, size); |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6107 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6108 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6109 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6110 void |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6111 w32_unload_font (dpyinfo, font) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6112 struct w32_display_info *dpyinfo; |
13434 | 6113 XFontStruct * font; |
6114 { | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6115 if (font) |
13434 | 6116 { |
32721
0574ffc14f77
(w32_load_system_font): Call w32_cache_char_metrics.
Andrew Innes <andrewi@gnu.org>
parents:
32669
diff
changeset
|
6117 if (font->per_char) xfree (font->per_char); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6118 if (font->bdf) w32_free_bdf_font (font->bdf); |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6119 |
14353 | 6120 if (font->hfont) DeleteObject(font->hfont); |
13434 | 6121 xfree (font); |
6122 } | |
6123 } | |
6124 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6125 /* The font conversion stuff between x and w32 */ |
13434 | 6126 |
6127 /* X font string is as follows (from faces.el) | |
6128 * (let ((- "[-?]") | |
6129 * (foundry "[^-]+") | |
6130 * (family "[^-]+") | |
6131 * (weight "\\(bold\\|demibold\\|medium\\)") ; 1 | |
6132 * (weight\? "\\([^-]*\\)") ; 1 | |
6133 * (slant "\\([ior]\\)") ; 2 | |
6134 * (slant\? "\\([^-]?\\)") ; 2 | |
6135 * (swidth "\\([^-]*\\)") ; 3 | |
6136 * (adstyle "[^-]*") ; 4 | |
6137 * (pixelsize "[0-9]+") | |
6138 * (pointsize "[0-9][0-9]+") | |
6139 * (resx "[0-9][0-9]+") | |
6140 * (resy "[0-9][0-9]+") | |
6141 * (spacing "[cmp?*]") | |
6142 * (avgwidth "[0-9]+") | |
6143 * (registry "[^-]+") | |
6144 * (encoding "[^-]+") | |
6145 * ) | |
6146 */ | |
6147 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6148 static LONG |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6149 x_to_w32_weight (lpw) |
13434 | 6150 char * lpw; |
6151 { | |
6152 if (!lpw) return (FW_DONTCARE); | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6153 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6154 if (stricmp (lpw,"heavy") == 0) return FW_HEAVY; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6155 else if (stricmp (lpw,"extrabold") == 0) return FW_EXTRABOLD; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6156 else if (stricmp (lpw,"bold") == 0) return FW_BOLD; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6157 else if (stricmp (lpw,"demibold") == 0) return FW_SEMIBOLD; |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
6158 else if (stricmp (lpw,"semibold") == 0) return FW_SEMIBOLD; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6159 else if (stricmp (lpw,"medium") == 0) return FW_MEDIUM; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6160 else if (stricmp (lpw,"normal") == 0) return FW_NORMAL; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6161 else if (stricmp (lpw,"light") == 0) return FW_LIGHT; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6162 else if (stricmp (lpw,"extralight") == 0) return FW_EXTRALIGHT; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6163 else if (stricmp (lpw,"thin") == 0) return FW_THIN; |
13434 | 6164 else |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6165 return FW_DONTCARE; |
13434 | 6166 } |
6167 | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6168 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6169 static char * |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6170 w32_to_x_weight (fnweight) |
13434 | 6171 int fnweight; |
6172 { | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6173 if (fnweight >= FW_HEAVY) return "heavy"; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6174 if (fnweight >= FW_EXTRABOLD) return "extrabold"; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6175 if (fnweight >= FW_BOLD) return "bold"; |
24856
07a04c532706
(w32_to_x_weight): Return "demibold" instead of "semibold".
Andrew Innes <andrewi@gnu.org>
parents:
24751
diff
changeset
|
6176 if (fnweight >= FW_SEMIBOLD) return "demibold"; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6177 if (fnweight >= FW_MEDIUM) return "medium"; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6178 if (fnweight >= FW_NORMAL) return "normal"; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6179 if (fnweight >= FW_LIGHT) return "light"; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6180 if (fnweight >= FW_EXTRALIGHT) return "extralight"; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6181 if (fnweight >= FW_THIN) return "thin"; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6182 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6183 return "*"; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6184 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6185 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6186 static LONG |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6187 x_to_w32_charset (lpcs) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6188 char * lpcs; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6189 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6190 Lisp_Object this_entry, w32_charset; |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6191 char *charset; |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6192 int len = strlen (lpcs); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6193 |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6194 /* Support "*-#nnn" format for unknown charsets. */ |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6195 if (strncmp (lpcs, "*-#", 3) == 0) |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6196 return atoi (lpcs + 3); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6197 |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6198 /* Handle wildcards by ignoring them; eg. treat "big5*-*" as "big5". */ |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6199 charset = alloca (len + 1); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6200 strcpy (charset, lpcs); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6201 lpcs = strchr (charset, '*'); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6202 if (lpcs) |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6203 *lpcs = 0; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6204 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6205 /* Look through w32-charset-info-alist for the character set. |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6206 Format of each entry is |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6207 (CHARSET_NAME . (WINDOWS_CHARSET . CODEPAGE)). |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6208 */ |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6209 this_entry = Fassoc (build_string(charset), Vw32_charset_info_alist); |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6210 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6211 if (NILP(this_entry)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6212 { |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6213 /* At startup, we want iso8859-1 fonts to come up properly. */ |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6214 if (stricmp(charset, "iso8859-1") == 0) |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6215 return ANSI_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6216 else |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6217 return DEFAULT_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6218 } |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6219 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6220 w32_charset = Fcar (Fcdr (this_entry)); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6221 |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6222 /* Translate Lisp symbol to number. */ |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6223 if (w32_charset == Qw32_charset_ansi) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6224 return ANSI_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6225 if (w32_charset == Qw32_charset_symbol) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6226 return SYMBOL_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6227 if (w32_charset == Qw32_charset_shiftjis) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6228 return SHIFTJIS_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6229 if (w32_charset == Qw32_charset_hangeul) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6230 return HANGEUL_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6231 if (w32_charset == Qw32_charset_chinesebig5) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6232 return CHINESEBIG5_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6233 if (w32_charset == Qw32_charset_gb2312) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6234 return GB2312_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6235 if (w32_charset == Qw32_charset_oem) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6236 return OEM_CHARSET; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6237 #ifdef JOHAB_CHARSET |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6238 if (w32_charset == Qw32_charset_johab) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6239 return JOHAB_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6240 if (w32_charset == Qw32_charset_easteurope) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6241 return EASTEUROPE_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6242 if (w32_charset == Qw32_charset_turkish) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6243 return TURKISH_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6244 if (w32_charset == Qw32_charset_baltic) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6245 return BALTIC_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6246 if (w32_charset == Qw32_charset_russian) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6247 return RUSSIAN_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6248 if (w32_charset == Qw32_charset_arabic) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6249 return ARABIC_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6250 if (w32_charset == Qw32_charset_greek) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6251 return GREEK_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6252 if (w32_charset == Qw32_charset_hebrew) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6253 return HEBREW_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6254 if (w32_charset == Qw32_charset_vietnamese) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6255 return VIETNAMESE_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6256 if (w32_charset == Qw32_charset_thai) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6257 return THAI_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6258 if (w32_charset == Qw32_charset_mac) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6259 return MAC_CHARSET; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6260 #endif /* JOHAB_CHARSET */ |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6261 #ifdef UNICODE_CHARSET |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6262 if (w32_charset == Qw32_charset_unicode) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6263 return UNICODE_CHARSET; |
24718
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
6264 #endif |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6265 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6266 return DEFAULT_CHARSET; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6267 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6268 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6269 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6270 static char * |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6271 w32_to_x_charset (fncharset) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6272 int fncharset; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6273 { |
40528
7fb50bbb61ad
(w32_to_x_charset): Increase size of XLFD charset buffer.
Jason Rumney <jasonr@gnu.org>
parents:
40385
diff
changeset
|
6274 static char buf[32]; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6275 Lisp_Object charset_type; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6276 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6277 switch (fncharset) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6278 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6279 case ANSI_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6280 /* Handle startup case of w32-charset-info-alist not |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6281 being set up yet. */ |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6282 if (NILP(Vw32_charset_info_alist)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6283 return "iso8859-1"; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6284 charset_type = Qw32_charset_ansi; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6285 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6286 case DEFAULT_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6287 charset_type = Qw32_charset_default; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6288 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6289 case SYMBOL_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6290 charset_type = Qw32_charset_symbol; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6291 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6292 case SHIFTJIS_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6293 charset_type = Qw32_charset_shiftjis; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6294 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6295 case HANGEUL_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6296 charset_type = Qw32_charset_hangeul; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6297 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6298 case GB2312_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6299 charset_type = Qw32_charset_gb2312; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6300 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6301 case CHINESEBIG5_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6302 charset_type = Qw32_charset_chinesebig5; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6303 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6304 case OEM_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6305 charset_type = Qw32_charset_oem; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6306 break; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6307 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6308 /* More recent versions of Windows (95 and NT4.0) define more |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6309 character sets. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6310 #ifdef EASTEUROPE_CHARSET |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6311 case EASTEUROPE_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6312 charset_type = Qw32_charset_easteurope; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6313 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6314 case TURKISH_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6315 charset_type = Qw32_charset_turkish; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6316 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6317 case BALTIC_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6318 charset_type = Qw32_charset_baltic; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6319 break; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6320 case RUSSIAN_CHARSET: |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6321 charset_type = Qw32_charset_russian; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6322 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6323 case ARABIC_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6324 charset_type = Qw32_charset_arabic; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6325 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6326 case GREEK_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6327 charset_type = Qw32_charset_greek; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6328 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6329 case HEBREW_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6330 charset_type = Qw32_charset_hebrew; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6331 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6332 case VIETNAMESE_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6333 charset_type = Qw32_charset_vietnamese; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6334 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6335 case THAI_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6336 charset_type = Qw32_charset_thai; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6337 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6338 case MAC_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6339 charset_type = Qw32_charset_mac; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6340 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6341 case JOHAB_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6342 charset_type = Qw32_charset_johab; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6343 break; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6344 #endif |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6345 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6346 #ifdef UNICODE_CHARSET |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6347 case UNICODE_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6348 charset_type = Qw32_charset_unicode; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6349 break; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6350 #endif |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6351 default: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6352 /* Encode numerical value of unknown charset. */ |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6353 sprintf (buf, "*-#%u", fncharset); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6354 return buf; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6355 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6356 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6357 { |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6358 Lisp_Object rest; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6359 char * best_match = NULL; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6360 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6361 /* Look through w32-charset-info-alist for the character set. |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6362 Prefer ISO codepages, and prefer lower numbers in the ISO |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6363 range. Only return charsets for codepages which are installed. |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6364 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6365 Format of each entry is |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6366 (CHARSET_NAME . (WINDOWS_CHARSET . CODEPAGE)). |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6367 */ |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6368 for (rest = Vw32_charset_info_alist; CONSP (rest); rest = XCDR (rest)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6369 { |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6370 char * x_charset; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6371 Lisp_Object w32_charset; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6372 Lisp_Object codepage; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6373 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6374 Lisp_Object this_entry = XCAR (rest); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6375 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6376 /* Skip invalid entries in alist. */ |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6377 if (!CONSP (this_entry) || !STRINGP (XCAR (this_entry)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6378 || !CONSP (XCDR (this_entry)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6379 || !SYMBOLP (XCAR (XCDR (this_entry)))) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6380 continue; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6381 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6382 x_charset = SDATA (XCAR (this_entry)); |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6383 w32_charset = XCAR (XCDR (this_entry)); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6384 codepage = XCDR (XCDR (this_entry)); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6385 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6386 /* Look for Same charset and a valid codepage (or non-int |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6387 which means ignore). */ |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6388 if (w32_charset == charset_type |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6389 && (!INTEGERP (codepage) || codepage == CP_DEFAULT |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6390 || IsValidCodePage (XINT (codepage)))) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6391 { |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6392 /* If we don't have a match already, then this is the |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6393 best. */ |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6394 if (!best_match) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6395 best_match = x_charset; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6396 /* If this is an ISO codepage, and the best so far isn't, |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6397 then this is better. */ |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6398 else if (strnicmp (best_match, "iso", 3) != 0 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6399 && strnicmp (x_charset, "iso", 3) == 0) |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6400 best_match = x_charset; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6401 /* If both are ISO8859 codepages, choose the one with the |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6402 lowest number in the encoding field. */ |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6403 else if (strnicmp (best_match, "iso8859-", 8) == 0 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6404 && strnicmp (x_charset, "iso8859-", 8) == 0) |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6405 { |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6406 int best_enc = atoi (best_match + 8); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6407 int this_enc = atoi (x_charset + 8); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6408 if (this_enc > 0 && this_enc < best_enc) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6409 best_match = x_charset; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6410 } |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6411 } |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6412 } |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6413 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6414 /* If no match, encode the numeric value. */ |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6415 if (!best_match) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6416 { |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6417 sprintf (buf, "*-#%u", fncharset); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6418 return buf; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6419 } |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6420 |
40528
7fb50bbb61ad
(w32_to_x_charset): Increase size of XLFD charset buffer.
Jason Rumney <jasonr@gnu.org>
parents:
40385
diff
changeset
|
6421 strncpy(buf, best_match, 31); |
7fb50bbb61ad
(w32_to_x_charset): Increase size of XLFD charset buffer.
Jason Rumney <jasonr@gnu.org>
parents:
40385
diff
changeset
|
6422 buf[31] = '\0'; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6423 return buf; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6424 } |
13434 | 6425 } |
6426 | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6427 |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6428 /* Return all the X charsets that map to a font. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6429 static Lisp_Object |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6430 w32_to_all_x_charsets (fncharset) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6431 int fncharset; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6432 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6433 static char buf[32]; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6434 Lisp_Object charset_type; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6435 Lisp_Object retval = Qnil; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6436 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6437 switch (fncharset) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6438 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6439 case ANSI_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6440 /* Handle startup case of w32-charset-info-alist not |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6441 being set up yet. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6442 if (NILP(Vw32_charset_info_alist)) |
43963
f5a7ee0b1b0e
(w32_to_all_x_charsets): Return correct type in startup case.
Jason Rumney <jasonr@gnu.org>
parents:
43773
diff
changeset
|
6443 return Fcons (build_string ("iso8859-1"), Qnil); |
f5a7ee0b1b0e
(w32_to_all_x_charsets): Return correct type in startup case.
Jason Rumney <jasonr@gnu.org>
parents:
43773
diff
changeset
|
6444 |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6445 charset_type = Qw32_charset_ansi; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6446 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6447 case DEFAULT_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6448 charset_type = Qw32_charset_default; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6449 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6450 case SYMBOL_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6451 charset_type = Qw32_charset_symbol; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6452 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6453 case SHIFTJIS_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6454 charset_type = Qw32_charset_shiftjis; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6455 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6456 case HANGEUL_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6457 charset_type = Qw32_charset_hangeul; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6458 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6459 case GB2312_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6460 charset_type = Qw32_charset_gb2312; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6461 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6462 case CHINESEBIG5_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6463 charset_type = Qw32_charset_chinesebig5; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6464 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6465 case OEM_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6466 charset_type = Qw32_charset_oem; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6467 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6468 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6469 /* More recent versions of Windows (95 and NT4.0) define more |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6470 character sets. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6471 #ifdef EASTEUROPE_CHARSET |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6472 case EASTEUROPE_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6473 charset_type = Qw32_charset_easteurope; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6474 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6475 case TURKISH_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6476 charset_type = Qw32_charset_turkish; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6477 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6478 case BALTIC_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6479 charset_type = Qw32_charset_baltic; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6480 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6481 case RUSSIAN_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6482 charset_type = Qw32_charset_russian; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6483 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6484 case ARABIC_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6485 charset_type = Qw32_charset_arabic; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6486 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6487 case GREEK_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6488 charset_type = Qw32_charset_greek; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6489 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6490 case HEBREW_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6491 charset_type = Qw32_charset_hebrew; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6492 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6493 case VIETNAMESE_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6494 charset_type = Qw32_charset_vietnamese; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6495 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6496 case THAI_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6497 charset_type = Qw32_charset_thai; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6498 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6499 case MAC_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6500 charset_type = Qw32_charset_mac; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6501 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6502 case JOHAB_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6503 charset_type = Qw32_charset_johab; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6504 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6505 #endif |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6506 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6507 #ifdef UNICODE_CHARSET |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6508 case UNICODE_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6509 charset_type = Qw32_charset_unicode; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6510 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6511 #endif |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6512 default: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6513 /* Encode numerical value of unknown charset. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6514 sprintf (buf, "*-#%u", fncharset); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6515 return Fcons (build_string (buf), Qnil); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6516 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6517 |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6518 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6519 Lisp_Object rest; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6520 /* Look through w32-charset-info-alist for the character set. |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6521 Only return charsets for codepages which are installed. |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6522 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6523 Format of each entry in Vw32_charset_info_alist is |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6524 (CHARSET_NAME . (WINDOWS_CHARSET . CODEPAGE)). |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6525 */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6526 for (rest = Vw32_charset_info_alist; CONSP (rest); rest = XCDR (rest)) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6527 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6528 Lisp_Object x_charset; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6529 Lisp_Object w32_charset; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6530 Lisp_Object codepage; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6531 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6532 Lisp_Object this_entry = XCAR (rest); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6533 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6534 /* Skip invalid entries in alist. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6535 if (!CONSP (this_entry) || !STRINGP (XCAR (this_entry)) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6536 || !CONSP (XCDR (this_entry)) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6537 || !SYMBOLP (XCAR (XCDR (this_entry)))) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6538 continue; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6539 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6540 x_charset = XCAR (this_entry); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6541 w32_charset = XCAR (XCDR (this_entry)); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6542 codepage = XCDR (XCDR (this_entry)); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6543 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6544 /* Look for Same charset and a valid codepage (or non-int |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6545 which means ignore). */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6546 if (w32_charset == charset_type |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6547 && (!INTEGERP (codepage) || codepage == CP_DEFAULT |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6548 || IsValidCodePage (XINT (codepage)))) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6549 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6550 retval = Fcons (x_charset, retval); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6551 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6552 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6553 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6554 /* If no match, encode the numeric value. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6555 if (NILP (retval)) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6556 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6557 sprintf (buf, "*-#%u", fncharset); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6558 return Fcons (build_string (buf), Qnil); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6559 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6560 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6561 return retval; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6562 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6563 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6564 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6565 /* Get the Windows codepage corresponding to the specified font. The |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6566 charset info in the font name is used to look up |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6567 w32-charset-to-codepage-alist. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6568 int |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6569 w32_codepage_for_font (char *fontname) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6570 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6571 Lisp_Object codepage, entry; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6572 char *charset_str, *charset, *end; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6573 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6574 if (NILP (Vw32_charset_info_alist)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6575 return CP_DEFAULT; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6576 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6577 /* Extract charset part of font string. */ |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6578 charset = xlfd_charset_of_font (fontname); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6579 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6580 if (!charset) |
34284
3a21ff35392b
(xlfd_charset_of_font): Don't overwrite fontname
Andrew Innes <andrewi@gnu.org>
parents:
34133
diff
changeset
|
6581 return CP_UNKNOWN; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6582 |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6583 charset_str = (char *) alloca (strlen (charset) + 1); |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6584 strcpy (charset_str, charset); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6585 |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6586 #if 0 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6587 /* Remove leading "*-". */ |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6588 if (strncmp ("*-", charset_str, 2) == 0) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6589 charset = charset_str + 2; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6590 else |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6591 #endif |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6592 charset = charset_str; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6593 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6594 /* Stop match at wildcard (including preceding '-'). */ |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6595 if (end = strchr (charset, '*')) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6596 { |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6597 if (end > charset && *(end-1) == '-') |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6598 end--; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6599 *end = '\0'; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6600 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6601 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6602 entry = Fassoc (build_string(charset), Vw32_charset_info_alist); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6603 if (NILP (entry)) |
34284
3a21ff35392b
(xlfd_charset_of_font): Don't overwrite fontname
Andrew Innes <andrewi@gnu.org>
parents:
34133
diff
changeset
|
6604 return CP_UNKNOWN; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6605 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6606 codepage = Fcdr (Fcdr (entry)); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6607 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6608 if (NILP (codepage)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6609 return CP_8BIT; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6610 else if (XFASTINT (codepage) == XFASTINT (Qt)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6611 return CP_UNICODE; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6612 else if (INTEGERP (codepage)) |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6613 return XINT (codepage); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6614 else |
34284
3a21ff35392b
(xlfd_charset_of_font): Don't overwrite fontname
Andrew Innes <andrewi@gnu.org>
parents:
34133
diff
changeset
|
6615 return CP_UNKNOWN; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6616 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6617 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6618 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6619 static BOOL |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6620 w32_to_x_font (lplogfont, lpxstr, len, specific_charset) |
13434 | 6621 LOGFONT * lplogfont; |
6622 char * lpxstr; | |
6623 int len; | |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6624 char * specific_charset; |
13434 | 6625 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6626 char* fonttype; |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6627 char *fontname; |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6628 char height_pixels[8]; |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6629 char height_dpi[8]; |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6630 char width_pixels[8]; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6631 char *fontname_dash; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
6632 int display_resy = (int) one_w32_display_info.resy; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
6633 int display_resx = (int) one_w32_display_info.resx; |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6634 int bufsz; |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6635 struct coding_system coding; |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6636 |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6637 if (!lpxstr) abort (); |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6638 |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6639 if (!lplogfont) |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6640 return FALSE; |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6641 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6642 if (lplogfont->lfOutPrecision == OUT_STRING_PRECIS) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6643 fonttype = "raster"; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6644 else if (lplogfont->lfOutPrecision == OUT_STROKE_PRECIS) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6645 fonttype = "outline"; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6646 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6647 fonttype = "unknown"; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6648 |
41322
482c520b29ba
(Vw32_system_coding_system): Remove.
Jason Rumney <jasonr@gnu.org>
parents:
41250
diff
changeset
|
6649 setup_coding_system (Fcheck_coding_system (Vlocale_coding_system), |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6650 &coding); |
29021
be2769eac1a5
(w32_to_x_font): Setup members src_multibyte and
Kenichi Handa <handa@m17n.org>
parents:
28983
diff
changeset
|
6651 coding.src_multibyte = 0; |
be2769eac1a5
(w32_to_x_font): Setup members src_multibyte and
Kenichi Handa <handa@m17n.org>
parents:
28983
diff
changeset
|
6652 coding.dst_multibyte = 1; |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6653 coding.mode |= CODING_MODE_LAST_BLOCK; |
45983
1f9be7a1addc
(w32_to_x_font): Disable composition handling.
Kenichi Handa <handa@m17n.org>
parents:
45963
diff
changeset
|
6654 /* We explicitely disable composition handling because selection |
1f9be7a1addc
(w32_to_x_font): Disable composition handling.
Kenichi Handa <handa@m17n.org>
parents:
45963
diff
changeset
|
6655 data should not contain any composition sequence. */ |
1f9be7a1addc
(w32_to_x_font): Disable composition handling.
Kenichi Handa <handa@m17n.org>
parents:
45963
diff
changeset
|
6656 coding.composing = COMPOSITION_DISABLED; |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6657 bufsz = decoding_buffer_size (&coding, LF_FACESIZE); |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6658 |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6659 fontname = alloca(sizeof(*fontname) * bufsz); |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6660 decode_coding (&coding, lplogfont->lfFaceName, fontname, |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6661 strlen(lplogfont->lfFaceName), bufsz - 1); |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6662 *(fontname + coding.produced) = '\0'; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6663 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6664 /* Replace dashes with underscores so the dashes are not |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6665 misinterpreted. */ |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6666 fontname_dash = fontname; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6667 while (fontname_dash = strchr (fontname_dash, '-')) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6668 *fontname_dash = '_'; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6669 |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6670 if (lplogfont->lfHeight) |
13434 | 6671 { |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6672 sprintf (height_pixels, "%u", abs (lplogfont->lfHeight)); |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6673 sprintf (height_dpi, "%u", |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6674 abs (lplogfont->lfHeight) * 720 / display_resy); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6675 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6676 else |
13434 | 6677 { |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6678 strcpy (height_pixels, "*"); |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6679 strcpy (height_dpi, "*"); |
13434 | 6680 } |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6681 if (lplogfont->lfWidth) |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6682 sprintf (width_pixels, "%u", lplogfont->lfWidth * 10); |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6683 else |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6684 strcpy (width_pixels, "*"); |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6685 |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6686 _snprintf (lpxstr, len - 1, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6687 "-%s-%s-%s-%c-normal-normal-%s-%s-%d-%d-%c-%s-%s", |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6688 fonttype, /* foundry */ |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6689 fontname, /* family */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6690 w32_to_x_weight (lplogfont->lfWeight), /* weight */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6691 lplogfont->lfItalic?'i':'r', /* slant */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6692 /* setwidth name */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6693 /* add style name */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6694 height_pixels, /* pixel size */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6695 height_dpi, /* point size */ |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6696 display_resx, /* resx */ |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6697 display_resy, /* resy */ |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6698 ((lplogfont->lfPitchAndFamily & 0x3) == VARIABLE_PITCH) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6699 ? 'p' : 'c', /* spacing */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6700 width_pixels, /* avg width */ |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6701 specific_charset ? specific_charset |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6702 : w32_to_x_charset (lplogfont->lfCharSet) |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6703 /* charset registry and encoding */ |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6704 ); |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
6705 |
13434 | 6706 lpxstr[len - 1] = 0; /* just to be sure */ |
6707 return (TRUE); | |
6708 } | |
6709 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6710 static BOOL |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6711 x_to_w32_font (lpxstr, lplogfont) |
13434 | 6712 char * lpxstr; |
6713 LOGFONT * lplogfont; | |
6714 { | |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6715 struct coding_system coding; |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6716 |
13434 | 6717 if (!lplogfont) return (FALSE); |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6718 |
13434 | 6719 memset (lplogfont, 0, sizeof (*lplogfont)); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6720 |
23620
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
6721 /* Set default value for each field. */ |
15380
8b01836a6b06
(x_to_win32_font): Allow any quality fonts.
Richard M. Stallman <rms@gnu.org>
parents:
15377
diff
changeset
|
6722 #if 1 |
13434 | 6723 lplogfont->lfOutPrecision = OUT_DEFAULT_PRECIS; |
6724 lplogfont->lfClipPrecision = CLIP_DEFAULT_PRECIS; | |
6725 lplogfont->lfQuality = DEFAULT_QUALITY; | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6726 #else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6727 /* go for maximum quality */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6728 lplogfont->lfOutPrecision = OUT_STROKE_PRECIS; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6729 lplogfont->lfClipPrecision = CLIP_STROKE_PRECIS; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6730 lplogfont->lfQuality = PROOF_QUALITY; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6731 #endif |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6732 |
23620
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
6733 lplogfont->lfCharSet = DEFAULT_CHARSET; |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
6734 lplogfont->lfWeight = FW_DONTCARE; |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
6735 lplogfont->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
6736 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6737 if (!lpxstr) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6738 return FALSE; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6739 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6740 /* Provide a simple escape mechanism for specifying Windows font names |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6741 * directly -- if font spec does not beginning with '-', assume this |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6742 * format: |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6743 * "<font name>[:height in pixels[:width in pixels[:weight]]]" |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6744 */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6745 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6746 if (*lpxstr == '-') |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6747 { |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6748 int fields, tem; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6749 char name[50], weight[20], slant, pitch, pixels[10], height[10], |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6750 width[10], resy[10], remainder[50]; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6751 char * encoding; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
6752 int dpi = (int) one_w32_display_info.resy; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6753 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6754 fields = sscanf (lpxstr, |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6755 "-%*[^-]-%49[^-]-%19[^-]-%c-%*[^-]-%*[^-]-%9[^-]-%9[^-]-%*[^-]-%9[^-]-%c-%9[^-]-%49s", |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6756 name, weight, &slant, pixels, height, resy, &pitch, width, remainder); |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6757 if (fields == EOF) |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6758 return (FALSE); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6759 |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6760 /* In the general case when wildcards cover more than one field, |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6761 we don't know which field is which, so don't fill any in. |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6762 However, we need to cope with this particular form, which is |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6763 generated by font_list_1 (invoked by try_font_list): |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6764 "-raster-6x10-*-gb2312*-*" |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6765 and make sure to correctly parse the charset field. */ |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6766 if (fields == 3) |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6767 { |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6768 fields = sscanf (lpxstr, |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6769 "-%*[^-]-%49[^-]-*-%49s", |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6770 name, remainder); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6771 } |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6772 else if (fields < 9) |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6773 { |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6774 fields = 0; |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6775 remainder[0] = 0; |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6776 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6777 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6778 if (fields > 0 && name[0] != '*') |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6779 { |
24583
0e5c5bd9b99d
(x_to_w32_font): Provide sufficient buffer to encode_coding to avoid carryover.
Richard M. Stallman <rms@gnu.org>
parents:
24497
diff
changeset
|
6780 int bufsize; |
0e5c5bd9b99d
(x_to_w32_font): Provide sufficient buffer to encode_coding to avoid carryover.
Richard M. Stallman <rms@gnu.org>
parents:
24497
diff
changeset
|
6781 unsigned char *buf; |
0e5c5bd9b99d
(x_to_w32_font): Provide sufficient buffer to encode_coding to avoid carryover.
Richard M. Stallman <rms@gnu.org>
parents:
24497
diff
changeset
|
6782 |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6783 setup_coding_system |
41322
482c520b29ba
(Vw32_system_coding_system): Remove.
Jason Rumney <jasonr@gnu.org>
parents:
41250
diff
changeset
|
6784 (Fcheck_coding_system (Vlocale_coding_system), &coding); |
29021
be2769eac1a5
(w32_to_x_font): Setup members src_multibyte and
Kenichi Handa <handa@m17n.org>
parents:
28983
diff
changeset
|
6785 coding.src_multibyte = 1; |
be2769eac1a5
(w32_to_x_font): Setup members src_multibyte and
Kenichi Handa <handa@m17n.org>
parents:
28983
diff
changeset
|
6786 coding.dst_multibyte = 1; |
24583
0e5c5bd9b99d
(x_to_w32_font): Provide sufficient buffer to encode_coding to avoid carryover.
Richard M. Stallman <rms@gnu.org>
parents:
24497
diff
changeset
|
6787 bufsize = encoding_buffer_size (&coding, strlen (name)); |
0e5c5bd9b99d
(x_to_w32_font): Provide sufficient buffer to encode_coding to avoid carryover.
Richard M. Stallman <rms@gnu.org>
parents:
24497
diff
changeset
|
6788 buf = (unsigned char *) alloca (bufsize); |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
6789 coding.mode |= CODING_MODE_LAST_BLOCK; |
24583
0e5c5bd9b99d
(x_to_w32_font): Provide sufficient buffer to encode_coding to avoid carryover.
Richard M. Stallman <rms@gnu.org>
parents:
24497
diff
changeset
|
6790 encode_coding (&coding, name, buf, strlen (name), bufsize); |
0e5c5bd9b99d
(x_to_w32_font): Provide sufficient buffer to encode_coding to avoid carryover.
Richard M. Stallman <rms@gnu.org>
parents:
24497
diff
changeset
|
6791 if (coding.produced >= LF_FACESIZE) |
0e5c5bd9b99d
(x_to_w32_font): Provide sufficient buffer to encode_coding to avoid carryover.
Richard M. Stallman <rms@gnu.org>
parents:
24497
diff
changeset
|
6792 coding.produced = LF_FACESIZE - 1; |
0e5c5bd9b99d
(x_to_w32_font): Provide sufficient buffer to encode_coding to avoid carryover.
Richard M. Stallman <rms@gnu.org>
parents:
24497
diff
changeset
|
6793 buf[coding.produced] = 0; |
0e5c5bd9b99d
(x_to_w32_font): Provide sufficient buffer to encode_coding to avoid carryover.
Richard M. Stallman <rms@gnu.org>
parents:
24497
diff
changeset
|
6794 strcpy (lplogfont->lfFaceName, buf); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6795 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6796 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6797 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6798 lplogfont->lfFaceName[0] = '\0'; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6799 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6800 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6801 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6802 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6803 lplogfont->lfWeight = x_to_w32_weight ((fields > 0 ? weight : "")); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6804 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6805 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6806 |
33879
9bbea0dda9cd
(x_to_w32_font): Do not filter out italic fonts, as new
Jason Rumney <jasonr@gnu.org>
parents:
33870
diff
changeset
|
6807 lplogfont->lfItalic = (fields > 0 && slant == 'i'); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6808 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6809 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6810 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6811 if (fields > 0 && pixels[0] != '*') |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6812 lplogfont->lfHeight = atoi (pixels); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6813 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6814 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6815 fields--; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6816 if (fields > 0 && resy[0] != '*') |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6817 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6818 tem = atoi (resy); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6819 if (tem > 0) dpi = tem; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6820 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6821 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6822 if (fields > -1 && lplogfont->lfHeight == 0 && height[0] != '*') |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6823 lplogfont->lfHeight = atoi (height) * dpi / 720; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6824 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6825 if (fields > 0) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6826 lplogfont->lfPitchAndFamily = |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6827 (fields > 0 && pitch == 'p') ? VARIABLE_PITCH : FIXED_PITCH; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6828 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6829 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6830 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6831 if (fields > 0 && width[0] != '*') |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6832 lplogfont->lfWidth = atoi (width) / 10; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6833 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6834 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6835 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6836 /* Strip the trailing '-' if present. (it shouldn't be, as it |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6837 fails the test against xlfd-tight-regexp in fontset.el). */ |
14353 | 6838 { |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6839 int len = strlen (remainder); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6840 if (len > 0 && remainder[len-1] == '-') |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6841 remainder[len-1] = 0; |
13434 | 6842 } |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6843 encoding = remainder; |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6844 #if 0 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6845 if (strncmp (encoding, "*-", 2) == 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6846 encoding += 2; |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6847 #endif |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
6848 lplogfont->lfCharSet = x_to_w32_charset (encoding); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6849 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6850 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6851 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6852 int fields; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6853 char name[100], height[10], width[10], weight[20]; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6854 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6855 fields = sscanf (lpxstr, |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6856 "%99[^:]:%9[^:]:%9[^:]:%19s", |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6857 name, height, width, weight); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6858 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6859 if (fields == EOF) return (FALSE); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6860 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6861 if (fields > 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6862 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6863 strncpy (lplogfont->lfFaceName,name, LF_FACESIZE); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6864 lplogfont->lfFaceName[LF_FACESIZE-1] = 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6865 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6866 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6867 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6868 lplogfont->lfFaceName[0] = 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6869 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6870 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6871 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6872 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6873 if (fields > 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6874 lplogfont->lfHeight = atoi (height); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6875 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6876 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6877 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6878 if (fields > 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6879 lplogfont->lfWidth = atoi (width); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6880 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6881 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6882 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6883 lplogfont->lfWeight = x_to_w32_weight ((fields > 0 ? weight : "")); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6884 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6885 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6886 /* This makes TrueType fonts work better. */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6887 lplogfont->lfHeight = - abs (lplogfont->lfHeight); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6888 |
13434 | 6889 return (TRUE); |
6890 } | |
6891 | |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6892 /* Strip the pixel height and point height from the given xlfd, and |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6893 return the pixel height. If no pixel height is specified, calculate |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6894 one from the point height, or if that isn't defined either, return |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6895 0 (which usually signifies a scalable font). |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6896 */ |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6897 static int |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6898 xlfd_strip_height (char *fontname) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6899 { |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6900 int pixel_height, field_number; |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6901 char *read_from, *write_to; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6902 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6903 xassert (fontname); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6904 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6905 pixel_height = field_number = 0; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6906 write_to = NULL; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6907 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6908 /* Look for height fields. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6909 for (read_from = fontname; *read_from; read_from++) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6910 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6911 if (*read_from == '-') |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6912 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6913 field_number++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6914 if (field_number == 7) /* Pixel height. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6915 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6916 read_from++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6917 write_to = read_from; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6918 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6919 /* Find end of field. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6920 for (;*read_from && *read_from != '-'; read_from++) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6921 ; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6922 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6923 /* Split the fontname at end of field. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6924 if (*read_from) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6925 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6926 *read_from = '\0'; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6927 read_from++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6928 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6929 pixel_height = atoi (write_to); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6930 /* Blank out field. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6931 if (read_from > write_to) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6932 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6933 *write_to = '-'; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6934 write_to++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6935 } |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6936 /* If the pixel height field is at the end (partial xlfd), |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6937 return now. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6938 else |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6939 return pixel_height; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6940 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6941 /* If we got a pixel height, the point height can be |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6942 ignored. Just blank it out and break now. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6943 if (pixel_height) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6944 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6945 /* Find end of point size field. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6946 for (; *read_from && *read_from != '-'; read_from++) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6947 ; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6948 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6949 if (*read_from) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6950 read_from++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6951 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6952 /* Blank out the point size field. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6953 if (read_from > write_to) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6954 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6955 *write_to = '-'; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6956 write_to++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6957 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6958 else |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6959 return pixel_height; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6960 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6961 break; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6962 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6963 /* If the point height is already blank, break now. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6964 if (*read_from == '-') |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6965 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6966 read_from++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6967 break; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6968 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6969 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6970 else if (field_number == 8) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6971 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6972 /* If we didn't get a pixel height, try to get the point |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6973 height and convert that. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6974 int point_size; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6975 char *point_size_start = read_from++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6976 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6977 /* Find end of field. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6978 for (; *read_from && *read_from != '-'; read_from++) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6979 ; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6980 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6981 if (*read_from) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6982 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6983 *read_from = '\0'; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6984 read_from++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6985 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6986 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6987 point_size = atoi (point_size_start); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6988 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6989 /* Convert to pixel height. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6990 pixel_height = point_size |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6991 * one_w32_display_info.height_in / 720; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6992 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6993 /* Blank out this field and break. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6994 *write_to = '-'; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6995 write_to++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6996 break; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6997 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6998 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
6999 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7000 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7001 /* Shift the rest of the font spec into place. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7002 if (write_to && read_from > write_to) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7003 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7004 for (; *read_from; read_from++, write_to++) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7005 *write_to = *read_from; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7006 *write_to = '\0'; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7007 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7008 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7009 return pixel_height; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7010 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7011 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7012 /* Assume parameter 1 is fully qualified, no wildcards. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7013 static BOOL |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7014 w32_font_match (fontname, pattern) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7015 char * fontname; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7016 char * pattern; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7017 { |
35674
62b578dd28ce
(w32_font_match): Allocate three more bytes to regex
Kenichi Handa <handa@m17n.org>
parents:
35359
diff
changeset
|
7018 char *regex = alloca (strlen (pattern) * 2 + 3); |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7019 char *font_name_copy = alloca (strlen (fontname) + 1); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7020 char *ptr; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7021 |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7022 /* Copy fontname so we can modify it during comparison. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7023 strcpy (font_name_copy, fontname); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7024 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7025 ptr = regex; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7026 *ptr++ = '^'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7027 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7028 /* Turn pattern into a regexp and do a regexp match. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7029 for (; *pattern; pattern++) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7030 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7031 if (*pattern == '?') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7032 *ptr++ = '.'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7033 else if (*pattern == '*') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7034 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7035 *ptr++ = '.'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7036 *ptr++ = '*'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7037 } |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7038 else |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7039 *ptr++ = *pattern; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7040 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7041 *ptr = '$'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7042 *(ptr + 1) = '\0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7043 |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7044 /* Strip out font heights and compare them seperately, since |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7045 rounding error can cause mismatches. This also allows a |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7046 comparison between a font that declares only a pixel height and a |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7047 pattern that declares the point height. |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7048 */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7049 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7050 int font_height, pattern_height; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7051 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7052 font_height = xlfd_strip_height (font_name_copy); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7053 pattern_height = xlfd_strip_height (regex); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7054 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7055 /* Compare now, and don't bother doing expensive regexp matching |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7056 if the heights differ. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7057 if (font_height && pattern_height && (font_height != pattern_height)) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7058 return FALSE; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7059 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7060 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7061 return (fast_c_string_match_ignore_case (build_string (regex), |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
7062 font_name_copy) >= 0); |
13434 | 7063 } |
7064 | |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7065 /* Callback functions, and a structure holding info they need, for |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7066 listing system fonts on W32. We need one set of functions to do the |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7067 job properly, but these don't work on NT 3.51 and earlier, so we |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7068 have a second set which don't handle character sets properly to |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7069 fall back on. |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7070 |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7071 In both cases, there are two passes made. The first pass gets one |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7072 font from each family, the second pass lists all the fonts from |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7073 each family. */ |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7074 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7075 typedef struct enumfont_t |
13434 | 7076 { |
7077 HDC hdc; | |
7078 int numFonts; | |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
7079 LOGFONT logfont; |
13434 | 7080 XFontStruct *size_ref; |
45465
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
7081 Lisp_Object pattern; |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7082 Lisp_Object list; |
13434 | 7083 } enumfont_t; |
7084 | |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7085 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7086 static void |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7087 enum_font_maybe_add_to_list (enumfont_t *, LOGFONT *, char *, Lisp_Object); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7088 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7089 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7090 static int CALLBACK |
13434 | 7091 enum_font_cb2 (lplf, lptm, FontType, lpef) |
7092 ENUMLOGFONT * lplf; | |
7093 NEWTEXTMETRIC * lptm; | |
7094 int FontType; | |
7095 enumfont_t * lpef; | |
7096 { | |
40873
f288d1d604a7
(enum_font_cb2): Use leading @ on face name to detect
Jason Rumney <jasonr@gnu.org>
parents:
40656
diff
changeset
|
7097 /* Ignore struck out and underlined versions of fonts. */ |
f288d1d604a7
(enum_font_cb2): Use leading @ on face name to detect
Jason Rumney <jasonr@gnu.org>
parents:
40656
diff
changeset
|
7098 if (lplf->elfLogFont.lfStrikeOut || lplf->elfLogFont.lfUnderline) |
f288d1d604a7
(enum_font_cb2): Use leading @ on face name to detect
Jason Rumney <jasonr@gnu.org>
parents:
40656
diff
changeset
|
7099 return 1; |
f288d1d604a7
(enum_font_cb2): Use leading @ on face name to detect
Jason Rumney <jasonr@gnu.org>
parents:
40656
diff
changeset
|
7100 |
f288d1d604a7
(enum_font_cb2): Use leading @ on face name to detect
Jason Rumney <jasonr@gnu.org>
parents:
40656
diff
changeset
|
7101 /* Only return fonts with names starting with @ if they were |
f288d1d604a7
(enum_font_cb2): Use leading @ on face name to detect
Jason Rumney <jasonr@gnu.org>
parents:
40656
diff
changeset
|
7102 explicitly specified, since Microsoft uses an initial @ to |
f288d1d604a7
(enum_font_cb2): Use leading @ on face name to detect
Jason Rumney <jasonr@gnu.org>
parents:
40656
diff
changeset
|
7103 denote fonts for vertical writing, without providing a more |
f288d1d604a7
(enum_font_cb2): Use leading @ on face name to detect
Jason Rumney <jasonr@gnu.org>
parents:
40656
diff
changeset
|
7104 convenient way of identifying them. */ |
f288d1d604a7
(enum_font_cb2): Use leading @ on face name to detect
Jason Rumney <jasonr@gnu.org>
parents:
40656
diff
changeset
|
7105 if (lplf->elfLogFont.lfFaceName[0] == '@' |
f288d1d604a7
(enum_font_cb2): Use leading @ on face name to detect
Jason Rumney <jasonr@gnu.org>
parents:
40656
diff
changeset
|
7106 && lpef->logfont.lfFaceName[0] != '@') |
40528
7fb50bbb61ad
(w32_to_x_charset): Increase size of XLFD charset buffer.
Jason Rumney <jasonr@gnu.org>
parents:
40385
diff
changeset
|
7107 return 1; |
7fb50bbb61ad
(w32_to_x_charset): Increase size of XLFD charset buffer.
Jason Rumney <jasonr@gnu.org>
parents:
40385
diff
changeset
|
7108 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7109 /* Check that the character set matches if it was specified */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7110 if (lpef->logfont.lfCharSet != DEFAULT_CHARSET && |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7111 lplf->elfLogFont.lfCharSet != lpef->logfont.lfCharSet) |
40528
7fb50bbb61ad
(w32_to_x_charset): Increase size of XLFD charset buffer.
Jason Rumney <jasonr@gnu.org>
parents:
40385
diff
changeset
|
7112 return 1; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7113 |
45232
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7114 if (FontType == RASTER_FONTTYPE) |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7115 { |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7116 /* DBCS raster fonts have problems displaying, so skip them. */ |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7117 int charset = lplf->elfLogFont.lfCharSet; |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7118 if (charset == SHIFTJIS_CHARSET |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7119 || charset == HANGEUL_CHARSET |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7120 || charset == CHINESEBIG5_CHARSET |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7121 || charset == GB2312_CHARSET |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7122 #ifdef JOHAB_CHARSET |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7123 || charset == JOHAB_CHARSET |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7124 #endif |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7125 ) |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7126 return 1; |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7127 } |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
7128 |
13434 | 7129 { |
7130 char buf[100]; | |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7131 Lisp_Object width = Qnil; |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7132 Lisp_Object charset_list = Qnil; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
7133 char *charset = NULL; |
13434 | 7134 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7135 /* Truetype fonts do not report their true metrics until loaded */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7136 if (FontType != RASTER_FONTTYPE) |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
7137 { |
45465
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
7138 if (!NILP (lpef->pattern)) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7139 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7140 /* Scalable fonts are as big as you want them to be. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7141 lplf->elfLogFont.lfHeight = lpef->logfont.lfHeight; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7142 lplf->elfLogFont.lfWidth = lpef->logfont.lfWidth; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7143 width = make_number (lpef->logfont.lfWidth); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7144 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7145 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7146 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7147 lplf->elfLogFont.lfHeight = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7148 lplf->elfLogFont.lfWidth = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7149 } |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
7150 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7151 |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
7152 /* Make sure the height used here is the same as everywhere |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
7153 else (ie character height, not cell height). */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7154 if (lplf->elfLogFont.lfHeight > 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7155 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7156 /* lptm can be trusted for RASTER fonts, but not scalable ones. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7157 if (FontType == RASTER_FONTTYPE) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7158 lplf->elfLogFont.lfHeight = lptm->tmInternalLeading - lptm->tmHeight; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7159 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7160 lplf->elfLogFont.lfHeight = -lplf->elfLogFont.lfHeight; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7161 } |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7162 |
45465
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
7163 if (!NILP (lpef->pattern)) |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
7164 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7165 charset = xlfd_charset_of_font (SDATA (lpef->pattern)); |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
7166 |
43207
2dc57fcf62e9
(enum_font_cb2): Don't let charsets unknown to Windows
Jason Rumney <jasonr@gnu.org>
parents:
42935
diff
changeset
|
7167 /* We already checked charsets above, but DEFAULT_CHARSET |
2dc57fcf62e9
(enum_font_cb2): Don't let charsets unknown to Windows
Jason Rumney <jasonr@gnu.org>
parents:
42935
diff
changeset
|
7168 slipped through. So only allow exact matches for DEFAULT_CHARSET. */ |
2dc57fcf62e9
(enum_font_cb2): Don't let charsets unknown to Windows
Jason Rumney <jasonr@gnu.org>
parents:
42935
diff
changeset
|
7169 if (charset |
2dc57fcf62e9
(enum_font_cb2): Don't let charsets unknown to Windows
Jason Rumney <jasonr@gnu.org>
parents:
42935
diff
changeset
|
7170 && strncmp (charset, "*-*", 3) != 0 |
2dc57fcf62e9
(enum_font_cb2): Don't let charsets unknown to Windows
Jason Rumney <jasonr@gnu.org>
parents:
42935
diff
changeset
|
7171 && lpef->logfont.lfCharSet == DEFAULT_CHARSET |
2dc57fcf62e9
(enum_font_cb2): Don't let charsets unknown to Windows
Jason Rumney <jasonr@gnu.org>
parents:
42935
diff
changeset
|
7172 && strcmp (charset, w32_to_x_charset (DEFAULT_CHARSET)) != 0) |
2dc57fcf62e9
(enum_font_cb2): Don't let charsets unknown to Windows
Jason Rumney <jasonr@gnu.org>
parents:
42935
diff
changeset
|
7173 return 1; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
7174 } |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
7175 |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7176 if (charset) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7177 charset_list = Fcons (build_string (charset), Qnil); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7178 else |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7179 charset_list = w32_to_all_x_charsets (lplf->elfLogFont.lfCharSet); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7180 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7181 /* Loop through the charsets. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7182 for ( ; CONSP (charset_list); charset_list = Fcdr (charset_list)) |
13434 | 7183 { |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7184 Lisp_Object this_charset = Fcar (charset_list); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7185 charset = SDATA (this_charset); |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7186 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7187 /* List bold and italic variations if w32-enable-synthesized-fonts |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7188 is non-nil and this is a plain font. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7189 if (w32_enable_synthesized_fonts |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7190 && lplf->elfLogFont.lfWeight == FW_NORMAL |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7191 && lplf->elfLogFont.lfItalic == FALSE) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7192 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7193 enum_font_maybe_add_to_list (lpef, &(lplf->elfLogFont), |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7194 charset, width); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7195 /* bold. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7196 lplf->elfLogFont.lfWeight = FW_BOLD; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7197 enum_font_maybe_add_to_list (lpef, &(lplf->elfLogFont), |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7198 charset, width); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7199 /* bold italic. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7200 lplf->elfLogFont.lfItalic = TRUE; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7201 enum_font_maybe_add_to_list (lpef, &(lplf->elfLogFont), |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7202 charset, width); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7203 /* italic. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7204 lplf->elfLogFont.lfWeight = FW_NORMAL; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7205 enum_font_maybe_add_to_list (lpef, &(lplf->elfLogFont), |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7206 charset, width); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7207 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7208 else |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7209 enum_font_maybe_add_to_list (lpef, &(lplf->elfLogFont), |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7210 charset, width); |
13434 | 7211 } |
7212 } | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7213 |
40528
7fb50bbb61ad
(w32_to_x_charset): Increase size of XLFD charset buffer.
Jason Rumney <jasonr@gnu.org>
parents:
40385
diff
changeset
|
7214 return 1; |
13434 | 7215 } |
7216 | |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7217 static void |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7218 enum_font_maybe_add_to_list (lpef, logfont, match_charset, width) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7219 enumfont_t * lpef; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7220 LOGFONT * logfont; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7221 char * match_charset; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7222 Lisp_Object width; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7223 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7224 char buf[100]; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7225 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7226 if (!w32_to_x_font (logfont, buf, 100, match_charset)) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7227 return; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7228 |
45465
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
7229 if (NILP (lpef->pattern) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7230 || w32_font_match (buf, SDATA (lpef->pattern))) |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7231 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7232 /* Check if we already listed this font. This may happen if |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7233 w32_enable_synthesized_fonts is non-nil, and there are real |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7234 bold and italic versions of the font. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7235 Lisp_Object font_name = build_string (buf); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7236 if (NILP (Fmember (font_name, lpef->list))) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7237 { |
45465
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
7238 Lisp_Object entry = Fcons (font_name, width); |
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
7239 lpef->list = Fcons (entry, lpef->list); |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7240 lpef->numFonts++; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7241 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7242 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7243 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7244 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
7245 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7246 static int CALLBACK |
13434 | 7247 enum_font_cb1 (lplf, lptm, FontType, lpef) |
7248 ENUMLOGFONT * lplf; | |
7249 NEWTEXTMETRIC * lptm; | |
7250 int FontType; | |
7251 enumfont_t * lpef; | |
7252 { | |
7253 return EnumFontFamilies (lpef->hdc, | |
7254 lplf->elfLogFont.lfFaceName, | |
7255 (FONTENUMPROC) enum_font_cb2, | |
7256 (LPARAM) lpef); | |
7257 } | |
7258 | |
7259 | |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7260 static int CALLBACK |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7261 enum_fontex_cb2 (lplf, lptm, font_type, lpef) |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7262 ENUMLOGFONTEX * lplf; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7263 NEWTEXTMETRICEX * lptm; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7264 int font_type; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7265 enumfont_t * lpef; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7266 { |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7267 /* We are not interested in the extra info we get back from the 'Ex |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7268 version - only the fact that we get character set variations |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7269 enumerated seperately. */ |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7270 return enum_font_cb2 ((ENUMLOGFONT *) lplf, (NEWTEXTMETRIC *) lptm, |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7271 font_type, lpef); |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7272 } |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7273 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7274 static int CALLBACK |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7275 enum_fontex_cb1 (lplf, lptm, font_type, lpef) |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7276 ENUMLOGFONTEX * lplf; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7277 NEWTEXTMETRICEX * lptm; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7278 int font_type; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7279 enumfont_t * lpef; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7280 { |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7281 HMODULE gdi32 = GetModuleHandle ("gdi32.dll"); |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7282 FARPROC enum_font_families_ex |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7283 = GetProcAddress ( gdi32, "EnumFontFamiliesExA"); |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7284 /* We don't really expect EnumFontFamiliesEx to disappear once we |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7285 get here, so don't bother handling it gracefully. */ |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7286 if (enum_font_families_ex == NULL) |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7287 error ("gdi32.dll has disappeared!"); |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7288 return enum_font_families_ex (lpef->hdc, |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7289 &lplf->elfLogFont, |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7290 (FONTENUMPROC) enum_fontex_cb2, |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7291 (LPARAM) lpef, 0); |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7292 } |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7293 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7294 /* Interface to fontset handler. (adapted from mw32font.c in Meadow |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7295 and xterm.c in Emacs 20.3) */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7296 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7297 static Lisp_Object w32_list_bdf_fonts (Lisp_Object pattern, int max_names) |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7298 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7299 char *fontname, *ptnstr; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7300 Lisp_Object list, tem, newlist = Qnil; |
24670 | 7301 int n_fonts = 0; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7302 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7303 list = Vw32_bdf_filename_alist; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7304 ptnstr = SDATA (pattern); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7305 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7306 for ( ; CONSP (list); list = XCDR (list)) |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7307 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7308 tem = XCAR (list); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7309 if (CONSP (tem)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7310 fontname = SDATA (XCAR (tem)); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7311 else if (STRINGP (tem)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7312 fontname = SDATA (tem); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7313 else |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7314 continue; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7315 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7316 if (w32_font_match (fontname, ptnstr)) |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7317 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7318 newlist = Fcons (XCAR (tem), newlist); |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7319 n_fonts++; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7320 if (n_fonts >= max_names) |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7321 break; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7322 } |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7323 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7324 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7325 return newlist; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7326 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7327 |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7328 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7329 /* Return a list of names of available fonts matching PATTERN on frame |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7330 F. If SIZE is not 0, it is the size (maximum bound width) of fonts |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7331 to be listed. Frame F NULL means we have not yet created any |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7332 frame, which means we can't get proper size info, as we don't have |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7333 a device context to use for GetTextMetrics. |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7334 MAXNAMES sets a limit on how many fonts to match. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7335 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7336 Lisp_Object |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
7337 w32_list_fonts (f, pattern, size, maxnames) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
7338 struct frame *f; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
7339 Lisp_Object pattern; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
7340 int size; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
7341 int maxnames; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7342 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7343 Lisp_Object patterns, key = Qnil, tem, tpat; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7344 Lisp_Object list = Qnil, newlist = Qnil, second_best = Qnil; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7345 struct w32_display_info *dpyinfo = &one_w32_display_info; |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7346 int n_fonts = 0; |
23637
54b22e0a1f7b
(w32_list_fonts): Report an error if a frame has not
Geoff Voelker <voelker@cs.washington.edu>
parents:
23620
diff
changeset
|
7347 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7348 patterns = Fassoc (pattern, Valternate_fontname_alist); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7349 if (NILP (patterns)) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7350 patterns = Fcons (pattern, Qnil); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7351 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7352 for (; CONSP (patterns); patterns = XCDR (patterns)) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7353 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7354 enumfont_t ef; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
7355 int codepage; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7356 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7357 tpat = XCAR (patterns); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7358 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
7359 if (!STRINGP (tpat)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
7360 continue; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
7361 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
7362 /* Avoid expensive EnumFontFamilies functions if we are not |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
7363 going to be able to output one of these anyway. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7364 codepage = w32_codepage_for_font (SDATA (tpat)); |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
7365 if (codepage != CP_8BIT && codepage != CP_UNICODE |
34284
3a21ff35392b
(xlfd_charset_of_font): Don't overwrite fontname
Andrew Innes <andrewi@gnu.org>
parents:
34133
diff
changeset
|
7366 && codepage != CP_DEFAULT && codepage != CP_UNKNOWN |
3a21ff35392b
(xlfd_charset_of_font): Don't overwrite fontname
Andrew Innes <andrewi@gnu.org>
parents:
34133
diff
changeset
|
7367 && !IsValidCodePage(codepage)) |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
7368 continue; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
7369 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7370 /* See if we cached the result for this particular query. |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7371 The cache is an alist of the form: |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7372 ((PATTERN (FONTNAME . WIDTH) ...) ...) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7373 */ |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7374 if (tem = XCDR (dpyinfo->name_list_element), |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7375 !NILP (list = Fassoc (tpat, tem))) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7376 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7377 list = Fcdr_safe (list); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7378 /* We have a cached list. Don't have to get the list again. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7379 goto label_cached; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7380 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7381 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7382 BLOCK_INPUT; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7383 /* At first, put PATTERN in the cache. */ |
45465
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
7384 ef.pattern = tpat; |
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
7385 ef.list = Qnil; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7386 ef.numFonts = 0; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7387 |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7388 /* Use EnumFontFamiliesEx where it is available, as it knows |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7389 about character sets. Fall back to EnumFontFamilies for |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7390 older versions of NT that don't support the 'Ex function. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7391 x_to_w32_font (SDATA (tpat), &ef.logfont); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7392 { |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7393 LOGFONT font_match_pattern; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7394 HMODULE gdi32 = GetModuleHandle ("gdi32.dll"); |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7395 FARPROC enum_font_families_ex |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7396 = GetProcAddress ( gdi32, "EnumFontFamiliesExA"); |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7397 |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7398 /* We do our own pattern matching so we can handle wildcards. */ |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7399 font_match_pattern.lfFaceName[0] = 0; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7400 font_match_pattern.lfPitchAndFamily = 0; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7401 /* We can use the charset, because if it is a wildcard it will |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7402 be DEFAULT_CHARSET anyway. */ |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7403 font_match_pattern.lfCharSet = ef.logfont.lfCharSet; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7404 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7405 ef.hdc = GetDC (dpyinfo->root_window); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7406 |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7407 if (enum_font_families_ex) |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7408 enum_font_families_ex (ef.hdc, |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7409 &font_match_pattern, |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7410 (FONTENUMPROC) enum_fontex_cb1, |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7411 (LPARAM) &ef, 0); |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7412 else |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7413 EnumFontFamilies (ef.hdc, NULL, (FONTENUMPROC) enum_font_cb1, |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7414 (LPARAM)&ef); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7415 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7416 ReleaseDC (dpyinfo->root_window, ef.hdc); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7417 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7418 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7419 UNBLOCK_INPUT; |
45465
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
7420 list = ef.list; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7421 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7422 /* Make a list of the fonts we got back. |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7423 Store that in the font cache for the display. */ |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39812
diff
changeset
|
7424 XSETCDR (dpyinfo->name_list_element, |
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39812
diff
changeset
|
7425 Fcons (Fcons (tpat, list), |
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39812
diff
changeset
|
7426 XCDR (dpyinfo->name_list_element))); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7427 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7428 label_cached: |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7429 if (NILP (list)) continue; /* Try the remaining alternatives. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7430 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7431 newlist = second_best = Qnil; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7432 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7433 /* Make a list of the fonts that have the right width. */ |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7434 for (; CONSP (list); list = XCDR (list)) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7435 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7436 int found_size; |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7437 tem = XCAR (list); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7438 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7439 if (!CONSP (tem)) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7440 continue; |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7441 if (NILP (XCAR (tem))) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7442 continue; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7443 if (!size) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7444 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7445 newlist = Fcons (XCAR (tem), newlist); |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7446 n_fonts++; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7447 if (n_fonts >= maxnames) |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7448 break; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7449 else |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7450 continue; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7451 } |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7452 if (!INTEGERP (XCDR (tem))) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7453 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7454 /* Since we don't yet know the size of the font, we must |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7455 load it and try GetTextMetrics. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7456 W32FontStruct thisinfo; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7457 LOGFONT lf; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7458 HDC hdc; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7459 HANDLE oldobj; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7460 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7461 if (!x_to_w32_font (SDATA (XCAR (tem)), &lf)) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7462 continue; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7463 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7464 BLOCK_INPUT; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7465 thisinfo.bdf = NULL; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7466 thisinfo.hfont = CreateFontIndirect (&lf); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7467 if (thisinfo.hfont == NULL) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7468 continue; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7469 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7470 hdc = GetDC (dpyinfo->root_window); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7471 oldobj = SelectObject (hdc, thisinfo.hfont); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7472 if (GetTextMetrics (hdc, &thisinfo.tm)) |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39812
diff
changeset
|
7473 XSETCDR (tem, make_number (FONT_WIDTH (&thisinfo))); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7474 else |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39812
diff
changeset
|
7475 XSETCDR (tem, make_number (0)); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7476 SelectObject (hdc, oldobj); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7477 ReleaseDC (dpyinfo->root_window, hdc); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7478 DeleteObject(thisinfo.hfont); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7479 UNBLOCK_INPUT; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7480 } |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7481 found_size = XINT (XCDR (tem)); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7482 if (found_size == size) |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7483 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7484 newlist = Fcons (XCAR (tem), newlist); |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7485 n_fonts++; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7486 if (n_fonts >= maxnames) |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7487 break; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7488 } |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7489 /* keep track of the closest matching size in case |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7490 no exact match is found. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7491 else if (found_size > 0) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7492 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7493 if (NILP (second_best)) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7494 second_best = tem; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7495 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7496 else if (found_size < size) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7497 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7498 if (XINT (XCDR (second_best)) > size |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7499 || XINT (XCDR (second_best)) < found_size) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7500 second_best = tem; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7501 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7502 else |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7503 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7504 if (XINT (XCDR (second_best)) > size |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7505 && XINT (XCDR (second_best)) > |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7506 found_size) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7507 second_best = tem; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7508 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7509 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7510 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7511 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7512 if (!NILP (newlist)) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7513 break; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7514 else if (!NILP (second_best)) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7515 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7516 newlist = Fcons (XCAR (second_best), Qnil); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7517 break; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7518 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7519 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7520 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7521 /* Include any bdf fonts. */ |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7522 if (n_fonts < maxnames) |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7523 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7524 Lisp_Object combined[2]; |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7525 combined[0] = w32_list_bdf_fonts (pattern, maxnames - n_fonts); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7526 combined[1] = newlist; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7527 newlist = Fnconc(2, combined); |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7528 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7529 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7530 return newlist; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7531 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7532 |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
7533 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7534 /* Return a pointer to struct font_info of font FONT_IDX of frame F. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7535 struct font_info * |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7536 w32_get_font_info (f, font_idx) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7537 FRAME_PTR f; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7538 int font_idx; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7539 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7540 return (FRAME_W32_FONT_TABLE (f) + font_idx); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7541 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7542 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7543 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7544 struct font_info* |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7545 w32_query_font (struct frame *f, char *fontname) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7546 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7547 int i; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7548 struct font_info *pfi; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7549 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7550 pfi = FRAME_W32_FONT_TABLE (f); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7551 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7552 for (i = 0; i < one_w32_display_info.n_fonts ;i++, pfi++) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7553 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7554 if (strcmp(pfi->name, fontname) == 0) return pfi; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7555 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7556 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7557 return NULL; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7558 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7559 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7560 /* Find a CCL program for a font specified by FONTP, and set the member |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7561 `encoder' of the structure. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7562 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7563 void |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7564 w32_find_ccl_program (fontp) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7565 struct font_info *fontp; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7566 { |
25069
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
7567 Lisp_Object list, elt; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7568 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7569 for (list = Vfont_ccl_encoder_alist; CONSP (list); list = XCDR (list)) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7570 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7571 elt = XCAR (list); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7572 if (CONSP (elt) |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7573 && STRINGP (XCAR (elt)) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7574 && (fast_c_string_match_ignore_case (XCAR (elt), fontp->name) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7575 >= 0)) |
25069
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
7576 break; |
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
7577 } |
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
7578 if (! NILP (list)) |
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
7579 { |
25084
d89aa269255d
(w32_find_ccl_program): Add casting.
Kenichi Handa <handa@m17n.org>
parents:
25069
diff
changeset
|
7580 struct ccl_program *ccl |
d89aa269255d
(w32_find_ccl_program): Add casting.
Kenichi Handa <handa@m17n.org>
parents:
25069
diff
changeset
|
7581 = (struct ccl_program *) xmalloc (sizeof (struct ccl_program)); |
25069
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
7582 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7583 if (setup_ccl_program (ccl, XCDR (elt)) < 0) |
25069
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
7584 xfree (ccl); |
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
7585 else |
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
7586 fontp->font_encoder = ccl; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7587 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7588 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7589 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
7590 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7591 /* Find BDF files in a specified directory. (use GCPRO when calling, |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7592 as this calls lisp to get a directory listing). */ |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7593 static Lisp_Object |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7594 w32_find_bdf_fonts_in_dir (Lisp_Object directory) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7595 { |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7596 Lisp_Object filelist, list = Qnil; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7597 char fontname[100]; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7598 |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7599 if (!STRINGP(directory)) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7600 return Qnil; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7601 |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7602 filelist = Fdirectory_files (directory, Qt, |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7603 build_string (".*\\.[bB][dD][fF]"), Qt); |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7604 |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7605 for ( ; CONSP(filelist); filelist = XCDR (filelist)) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7606 { |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7607 Lisp_Object filename = XCAR (filelist); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7608 if (w32_BDF_to_x_font (SDATA (filename), fontname, 100)) |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7609 store_in_alist (&list, build_string (fontname), filename); |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7610 } |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7611 return list; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7612 } |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7613 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7614 DEFUN ("w32-find-bdf-fonts", Fw32_find_bdf_fonts, Sw32_find_bdf_fonts, |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7615 1, 1, 0, |
41019 | 7616 doc: /* Return a list of BDF fonts in DIR. |
7617 The list is suitable for appending to w32-bdf-filename-alist. Fonts | |
7618 which do not contain an xlfd description will not be included in the | |
7619 list. DIR may be a list of directories. */) | |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7620 (directory) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7621 Lisp_Object directory; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7622 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7623 Lisp_Object list = Qnil; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7624 struct gcpro gcpro1, gcpro2; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7625 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7626 if (!CONSP (directory)) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7627 return w32_find_bdf_fonts_in_dir (directory); |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7628 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7629 for ( ; CONSP (directory); directory = XCDR (directory)) |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7630 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7631 Lisp_Object pair[2]; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7632 pair[0] = list; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7633 pair[1] = Qnil; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7634 GCPRO2 (directory, list); |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7635 pair[1] = w32_find_bdf_fonts_in_dir( XCAR (directory) ); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7636 list = Fnconc( 2, pair ); |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7637 UNGCPRO; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7638 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7639 return list; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7640 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7641 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
7642 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
25646
diff
changeset
|
7643 DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7644 doc: /* Internal function called by `color-defined-p', which see. */) |
13434 | 7645 (color, frame) |
7646 Lisp_Object color, frame; | |
7647 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7648 XColor foo; |
13434 | 7649 FRAME_PTR f = check_x_frame (frame); |
7650 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
7651 CHECK_STRING (color); |
13434 | 7652 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7653 if (w32_defined_color (f, SDATA (color), &foo, 0)) |
13434 | 7654 return Qt; |
7655 else | |
7656 return Qnil; | |
7657 } | |
7658 | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
25646
diff
changeset
|
7659 DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7660 doc: /* Internal function called by `color-values', which see. */) |
13434 | 7661 (color, frame) |
7662 Lisp_Object color, frame; | |
7663 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7664 XColor foo; |
13434 | 7665 FRAME_PTR f = check_x_frame (frame); |
7666 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
7667 CHECK_STRING (color); |
13434 | 7668 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7669 if (w32_defined_color (f, SDATA (color), &foo, 0)) |
13434 | 7670 { |
7671 Lisp_Object rgb[3]; | |
7672 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7673 rgb[0] = make_number ((GetRValue (foo.pixel) << 8) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7674 | GetRValue (foo.pixel)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7675 rgb[1] = make_number ((GetGValue (foo.pixel) << 8) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7676 | GetGValue (foo.pixel)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7677 rgb[2] = make_number ((GetBValue (foo.pixel) << 8) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7678 | GetBValue (foo.pixel)); |
13434 | 7679 return Flist (3, rgb); |
7680 } | |
7681 else | |
7682 return Qnil; | |
7683 } | |
7684 | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
25646
diff
changeset
|
7685 DEFUN ("xw-display-color-p", Fxw_display_color_p, Sxw_display_color_p, 0, 1, 0, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7686 doc: /* Internal function called by `display-color-p', which see. */) |
13434 | 7687 (display) |
7688 Lisp_Object display; | |
7689 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7690 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 7691 |
7692 if ((dpyinfo->n_planes * dpyinfo->n_cbits) <= 2) | |
7693 return Qnil; | |
7694 | |
7695 return Qt; | |
7696 } | |
7697 | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7698 DEFUN ("x-display-grayscale-p", Fx_display_grayscale_p, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7699 Sx_display_grayscale_p, 0, 1, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7700 doc: /* Return t if the X display supports shades of gray. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7701 Note that color displays do support shades of gray. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7702 The optional argument DISPLAY specifies which display to ask about. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7703 DISPLAY should be either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7704 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 7705 (display) |
7706 Lisp_Object display; | |
7707 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7708 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 7709 |
7710 if ((dpyinfo->n_planes * dpyinfo->n_cbits) <= 1) | |
7711 return Qnil; | |
7712 | |
7713 return Qt; | |
7714 } | |
7715 | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7716 DEFUN ("x-display-pixel-width", Fx_display_pixel_width, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7717 Sx_display_pixel_width, 0, 1, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7718 doc: /* Returns the width in pixels of DISPLAY. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7719 The optional argument DISPLAY specifies which display to ask about. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7720 DISPLAY should be either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7721 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 7722 (display) |
7723 Lisp_Object display; | |
7724 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7725 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 7726 |
7727 return make_number (dpyinfo->width); | |
7728 } | |
7729 | |
7730 DEFUN ("x-display-pixel-height", Fx_display_pixel_height, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7731 Sx_display_pixel_height, 0, 1, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7732 doc: /* Returns the height in pixels of DISPLAY. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7733 The optional argument DISPLAY specifies which display to ask about. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7734 DISPLAY should be either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7735 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 7736 (display) |
7737 Lisp_Object display; | |
7738 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7739 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 7740 |
7741 return make_number (dpyinfo->height); | |
7742 } | |
7743 | |
7744 DEFUN ("x-display-planes", Fx_display_planes, Sx_display_planes, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7745 0, 1, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7746 doc: /* Returns the number of bitplanes of DISPLAY. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7747 The optional argument DISPLAY specifies which display to ask about. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7748 DISPLAY should be either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7749 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 7750 (display) |
7751 Lisp_Object display; | |
7752 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7753 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 7754 |
7755 return make_number (dpyinfo->n_planes * dpyinfo->n_cbits); | |
7756 } | |
7757 | |
7758 DEFUN ("x-display-color-cells", Fx_display_color_cells, Sx_display_color_cells, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7759 0, 1, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7760 doc: /* Returns the number of color cells of DISPLAY. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7761 The optional argument DISPLAY specifies which display to ask about. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7762 DISPLAY should be either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7763 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 7764 (display) |
7765 Lisp_Object display; | |
7766 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7767 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 7768 HDC hdc; |
7769 int cap; | |
7770 | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
7771 hdc = GetDC (dpyinfo->root_window); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
7772 if (dpyinfo->has_palette) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
7773 cap = GetDeviceCaps (hdc,SIZEPALETTE); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
7774 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
7775 cap = GetDeviceCaps (hdc,NUMCOLORS); |
34998
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
7776 |
43773
8d3931ead0df
(Fx_display_color_cells): Force 24+ bit color depths to 24-bit.
Juanma Barranquero <lekktu@gmail.com>
parents:
43484
diff
changeset
|
7777 /* We force 24+ bit depths to 24-bit, both to prevent an overflow |
8d3931ead0df
(Fx_display_color_cells): Force 24+ bit color depths to 24-bit.
Juanma Barranquero <lekktu@gmail.com>
parents:
43484
diff
changeset
|
7778 and because probably is more meaningful on Windows anyway */ |
34998
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
7779 if (cap < 0) |
43773
8d3931ead0df
(Fx_display_color_cells): Force 24+ bit color depths to 24-bit.
Juanma Barranquero <lekktu@gmail.com>
parents:
43484
diff
changeset
|
7780 cap = 1 << min(dpyinfo->n_planes * dpyinfo->n_cbits, 24); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7781 |
13434 | 7782 ReleaseDC (dpyinfo->root_window, hdc); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7783 |
13434 | 7784 return make_number (cap); |
7785 } | |
7786 | |
7787 DEFUN ("x-server-max-request-size", Fx_server_max_request_size, | |
7788 Sx_server_max_request_size, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7789 0, 1, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7790 doc: /* Returns the maximum request size of the server of DISPLAY. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7791 The optional argument DISPLAY specifies which display to ask about. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7792 DISPLAY should be either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7793 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 7794 (display) |
7795 Lisp_Object display; | |
7796 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7797 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 7798 |
7799 return make_number (1); | |
7800 } | |
7801 | |
7802 DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7803 doc: /* Returns the vendor ID string of the W32 system (Microsoft). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7804 The optional argument DISPLAY specifies which display to ask about. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7805 DISPLAY should be either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7806 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 7807 (display) |
7808 Lisp_Object display; | |
7809 { | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7810 return build_string ("Microsoft Corp."); |
13434 | 7811 } |
7812 | |
7813 DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7814 doc: /* Returns the version numbers of the server of DISPLAY. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7815 The value is a list of three integers: the major and minor |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7816 version numbers, and the vendor-specific release |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7817 number. See also the function `x-server-vendor'. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7818 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7819 The optional argument DISPLAY specifies which display to ask about. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7820 DISPLAY should be either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7821 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 7822 (display) |
7823 Lisp_Object display; | |
7824 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7825 return Fcons (make_number (w32_major_version), |
33216
2eb7d429a997
(Fx_server_version): Include w32_build_number in the
Andrew Innes <andrewi@gnu.org>
parents:
32977
diff
changeset
|
7826 Fcons (make_number (w32_minor_version), |
2eb7d429a997
(Fx_server_version): Include w32_build_number in the
Andrew Innes <andrewi@gnu.org>
parents:
32977
diff
changeset
|
7827 Fcons (make_number (w32_build_number), Qnil))); |
13434 | 7828 } |
7829 | |
7830 DEFUN ("x-display-screens", Fx_display_screens, Sx_display_screens, 0, 1, 0, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7831 doc: /* Returns the number of screens on the server of DISPLAY. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7832 The optional argument DISPLAY specifies which display to ask about. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7833 DISPLAY should be either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7834 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 7835 (display) |
7836 Lisp_Object display; | |
7837 { | |
7838 return make_number (1); | |
7839 } | |
7840 | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7841 DEFUN ("x-display-mm-height", Fx_display_mm_height, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7842 Sx_display_mm_height, 0, 1, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7843 doc: /* Returns the height in millimeters of DISPLAY. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7844 The optional argument DISPLAY specifies which display to ask about. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7845 DISPLAY should be either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7846 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 7847 (display) |
7848 Lisp_Object display; | |
7849 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7850 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 7851 HDC hdc; |
7852 int cap; | |
7853 | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
7854 hdc = GetDC (dpyinfo->root_window); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7855 |
13434 | 7856 cap = GetDeviceCaps (hdc, VERTSIZE); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7857 |
13434 | 7858 ReleaseDC (dpyinfo->root_window, hdc); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7859 |
13434 | 7860 return make_number (cap); |
7861 } | |
7862 | |
7863 DEFUN ("x-display-mm-width", Fx_display_mm_width, Sx_display_mm_width, 0, 1, 0, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7864 doc: /* Returns the width in millimeters of DISPLAY. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7865 The optional argument DISPLAY specifies which display to ask about. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7866 DISPLAY should be either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7867 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 7868 (display) |
7869 Lisp_Object display; | |
7870 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7871 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 7872 |
7873 HDC hdc; | |
7874 int cap; | |
7875 | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
7876 hdc = GetDC (dpyinfo->root_window); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7877 |
13434 | 7878 cap = GetDeviceCaps (hdc, HORZSIZE); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7879 |
13434 | 7880 ReleaseDC (dpyinfo->root_window, hdc); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7881 |
13434 | 7882 return make_number (cap); |
7883 } | |
7884 | |
7885 DEFUN ("x-display-backing-store", Fx_display_backing_store, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7886 Sx_display_backing_store, 0, 1, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7887 doc: /* Returns an indication of whether DISPLAY does backing store. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7888 The value may be `always', `when-mapped', or `not-useful'. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7889 The optional argument DISPLAY specifies which display to ask about. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7890 DISPLAY should be either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7891 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 7892 (display) |
7893 Lisp_Object display; | |
7894 { | |
7895 return intern ("not-useful"); | |
7896 } | |
7897 | |
7898 DEFUN ("x-display-visual-class", Fx_display_visual_class, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7899 Sx_display_visual_class, 0, 1, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7900 doc: /* Returns the visual class of DISPLAY. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7901 The value is one of the symbols `static-gray', `gray-scale', |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7902 `static-color', `pseudo-color', `true-color', or `direct-color'. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7903 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7904 The optional argument DISPLAY specifies which display to ask about. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7905 DISPLAY should be either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7906 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 7907 (display) |
7908 Lisp_Object display; | |
7909 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7910 struct w32_display_info *dpyinfo = check_x_display_info (display); |
34998
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
7911 Lisp_Object result = Qnil; |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
7912 |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
7913 if (dpyinfo->has_palette) |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
7914 result = intern ("pseudo-color"); |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
7915 else if (dpyinfo->n_planes * dpyinfo->n_cbits == 1) |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
7916 result = intern ("static-grey"); |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
7917 else if (dpyinfo->n_planes * dpyinfo->n_cbits == 4) |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
7918 result = intern ("static-color"); |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
7919 else if (dpyinfo->n_planes * dpyinfo->n_cbits > 8) |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
7920 result = intern ("true-color"); |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
7921 |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
7922 return result; |
13434 | 7923 } |
7924 | |
7925 DEFUN ("x-display-save-under", Fx_display_save_under, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7926 Sx_display_save_under, 0, 1, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7927 doc: /* Returns t if DISPLAY supports the save-under feature. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7928 The optional argument DISPLAY specifies which display to ask about. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7929 DISPLAY should be either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
7930 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 7931 (display) |
7932 Lisp_Object display; | |
7933 { | |
7934 return Qnil; | |
7935 } | |
7936 | |
7937 int | |
7938 x_pixel_width (f) | |
7939 register struct frame *f; | |
7940 { | |
7941 return PIXEL_WIDTH (f); | |
7942 } | |
7943 | |
7944 int | |
7945 x_pixel_height (f) | |
7946 register struct frame *f; | |
7947 { | |
7948 return PIXEL_HEIGHT (f); | |
7949 } | |
7950 | |
7951 int | |
7952 x_char_width (f) | |
7953 register struct frame *f; | |
7954 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7955 return FONT_WIDTH (f->output_data.w32->font); |
13434 | 7956 } |
7957 | |
7958 int | |
7959 x_char_height (f) | |
7960 register struct frame *f; | |
7961 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7962 return f->output_data.w32->line_height; |
13434 | 7963 } |
7964 | |
7965 int | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7966 x_screen_planes (f) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7967 register struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7968 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7969 return FRAME_W32_DISPLAY_INFO (f)->n_planes; |
13434 | 7970 } |
7971 | |
7972 /* Return the display structure for the display named NAME. | |
7973 Open a new connection if necessary. */ | |
7974 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7975 struct w32_display_info * |
13434 | 7976 x_display_info_for_name (name) |
7977 Lisp_Object name; | |
7978 { | |
7979 Lisp_Object names; | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7980 struct w32_display_info *dpyinfo; |
13434 | 7981 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
7982 CHECK_STRING (name); |
13434 | 7983 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7984 for (dpyinfo = &one_w32_display_info, names = w32_display_name_list; |
13434 | 7985 dpyinfo; |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7986 dpyinfo = dpyinfo->next, names = XCDR (names)) |
13434 | 7987 { |
7988 Lisp_Object tem; | |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
7989 tem = Fstring_equal (XCAR (XCAR (names)), name); |
13434 | 7990 if (!NILP (tem)) |
7991 return dpyinfo; | |
7992 } | |
7993 | |
7994 /* Use this general default value to start with. */ | |
7995 Vx_resource_name = Vinvocation_name; | |
7996 | |
7997 validate_x_resource_name (); | |
7998 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
7999 dpyinfo = w32_term_init (name, (unsigned char *)0, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
8000 (char *) SDATA (Vx_resource_name)); |
13434 | 8001 |
8002 if (dpyinfo == 0) | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
8003 error ("Cannot connect to server %s", SDATA (name)); |
13434 | 8004 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
8005 w32_in_use = 1; |
13434 | 8006 XSETFASTINT (Vwindow_system_version, 3); |
8007 | |
8008 return dpyinfo; | |
8009 } | |
8010 | |
8011 DEFUN ("x-open-connection", Fx_open_connection, Sx_open_connection, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
8012 1, 3, 0, doc: /* Open a connection to a server. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
8013 DISPLAY is the name of the display to connect to. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
8014 Optional second arg XRM-STRING is a string of resources in xrdb format. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
8015 If the optional third arg MUST-SUCCEED is non-nil, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
8016 terminate Emacs if we can't open the connection. */) |
13434 | 8017 (display, xrm_string, must_succeed) |
8018 Lisp_Object display, xrm_string, must_succeed; | |
8019 { | |
8020 unsigned char *xrm_option; | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
8021 struct w32_display_info *dpyinfo; |
13434 | 8022 |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
8023 /* If initialization has already been done, return now to avoid |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
8024 overwriting critical parts of one_w32_display_info. */ |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
8025 if (w32_in_use) |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
8026 return Qnil; |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
8027 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
8028 CHECK_STRING (display); |
13434 | 8029 if (! NILP (xrm_string)) |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
8030 CHECK_STRING (xrm_string); |
13434 | 8031 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
8032 if (! EQ (Vwindow_system, intern ("w32"))) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
8033 error ("Not using Microsoft Windows"); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
8034 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8035 /* Allow color mapping to be defined externally; first look in user's |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8036 HOME directory, then in Emacs etc dir for a file called rgb.txt. */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8037 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8038 Lisp_Object color_file; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8039 struct gcpro gcpro1; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8040 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8041 color_file = build_string("~/rgb.txt"); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8042 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8043 GCPRO1 (color_file); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8044 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8045 if (NILP (Ffile_readable_p (color_file))) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8046 color_file = |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8047 Fexpand_file_name (build_string ("rgb.txt"), |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8048 Fsymbol_value (intern ("data-directory"))); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8049 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
8050 Vw32_color_map = Fw32_load_color_file (color_file); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8051 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8052 UNGCPRO; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8053 } |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
8054 if (NILP (Vw32_color_map)) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
8055 Vw32_color_map = Fw32_default_color_map (); |
13434 | 8056 |
8057 if (! NILP (xrm_string)) | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
8058 xrm_option = (unsigned char *) SDATA (xrm_string); |
13434 | 8059 else |
8060 xrm_option = (unsigned char *) 0; | |
8061 | |
8062 /* Use this general default value to start with. */ | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8063 /* First remove .exe suffix from invocation-name - it looks ugly. */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8064 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8065 char basename[ MAX_PATH ], *str; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8066 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
8067 strcpy (basename, SDATA (Vinvocation_name)); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8068 str = strrchr (basename, '.'); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8069 if (str) *str = 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8070 Vinvocation_name = build_string (basename); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
8071 } |
13434 | 8072 Vx_resource_name = Vinvocation_name; |
8073 | |
8074 validate_x_resource_name (); | |
8075 | |
8076 /* This is what opens the connection and sets x_current_display. | |
8077 This also initializes many symbols, such as those used for input. */ | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
8078 dpyinfo = w32_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:
46293
diff
changeset
|
8079 (char *) SDATA (Vx_resource_name)); |
13434 | 8080 |
8081 if (dpyinfo == 0) | |
8082 { | |
8083 if (!NILP (must_succeed)) | |
14353 | 8084 fatal ("Cannot connect to server %s.\n", |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
8085 SDATA (display)); |
13434 | 8086 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
8087 error ("Cannot connect to server %s", SDATA (display)); |
13434 | 8088 } |
8089 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
8090 w32_in_use = 1; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
8091 |
13434 | 8092 XSETFASTINT (Vwindow_system_version, 3); |
8093 return Qnil; | |
8094 } | |
8095 | |
8096 DEFUN ("x-close-connection", Fx_close_connection, | |
8097 Sx_close_connection, 1, 1, 0, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
8098 doc: /* Close the connection to DISPLAY's server. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
8099 For DISPLAY, specify either a frame or a display name (a string). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
8100 If DISPLAY is nil, that stands for the selected frame's display. */) |
13434 | 8101 (display) |
8102 Lisp_Object display; | |
8103 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
8104 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 8105 int i; |
8106 | |
8107 if (dpyinfo->reference_count > 0) | |
8108 error ("Display still has frames on it"); | |
8109 | |
8110 BLOCK_INPUT; | |
8111 /* Free the fonts in the font table. */ | |
8112 for (i = 0; i < dpyinfo->n_fonts; i++) | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8113 if (dpyinfo->font_table[i].name) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8114 { |
28272
f62bb21d38db
(w32_wnd_proc): Handle WM_MENUSELECT message.
Jason Rumney <jasonr@gnu.org>
parents:
27936
diff
changeset
|
8115 if (dpyinfo->font_table[i].name != dpyinfo->font_table[i].full_name) |
f62bb21d38db
(w32_wnd_proc): Handle WM_MENUSELECT message.
Jason Rumney <jasonr@gnu.org>
parents:
27936
diff
changeset
|
8116 xfree (dpyinfo->font_table[i].full_name); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8117 xfree (dpyinfo->font_table[i].name); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8118 w32_unload_font (dpyinfo, dpyinfo->font_table[i].font); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8119 } |
13434 | 8120 x_destroy_all_bitmaps (dpyinfo); |
8121 | |
8122 x_delete_display (dpyinfo); | |
8123 UNBLOCK_INPUT; | |
8124 | |
8125 return Qnil; | |
8126 } | |
8127 | |
8128 DEFUN ("x-display-list", Fx_display_list, Sx_display_list, 0, 0, 0, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
8129 doc: /* Return the list of display names that Emacs has connections to. */) |
13434 | 8130 () |
8131 { | |
8132 Lisp_Object tail, result; | |
8133 | |
8134 result = Qnil; | |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
8135 for (tail = w32_display_name_list; ! NILP (tail); tail = XCDR (tail)) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
8136 result = Fcons (XCAR (XCAR (tail)), result); |
13434 | 8137 |
8138 return result; | |
8139 } | |
8140 | |
8141 DEFUN ("x-synchronize", Fx_synchronize, Sx_synchronize, 1, 2, 0, | |
41008 | 8142 doc: /* This is a noop on W32 systems. */) |
8143 (on, display) | |
8144 Lisp_Object display, on; | |
13434 | 8145 { |
8146 return Qnil; | |
8147 } | |
8148 | |
8149 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8150 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8151 Image types |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8152 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8153 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8154 /* Value is the number of elements of vector VECTOR. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8155 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8156 #define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8157 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8158 /* List of supported image types. Use define_image_type to add new |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8159 types. Use lookup_image_type to find a type for a given symbol. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8160 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8161 static struct image_type *image_types; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8162 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8163 /* The symbol `image' which is the car of the lists used to represent |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8164 images in Lisp. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8165 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8166 extern Lisp_Object Qimage; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8167 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8168 /* The symbol `xbm' which is used as the type symbol for XBM images. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8169 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8170 Lisp_Object Qxbm; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8171 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8172 /* Keywords. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8173 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8174 extern Lisp_Object QCwidth, QCheight, QCforeground, QCbackground, QCfile; |
44068
85388a495f68
(QCtype): Remove duplicate declaration and
Kim F. Storm <storm@cua.dk>
parents:
44047
diff
changeset
|
8175 extern Lisp_Object QCdata, QCtype; |
85388a495f68
(QCtype): Remove duplicate declaration and
Kim F. Storm <storm@cua.dk>
parents:
44047
diff
changeset
|
8176 Lisp_Object QCascent, QCmargin, QCrelief; |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
8177 Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8178 Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8179 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8180 /* Other symbols. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8181 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8182 Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8183 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8184 /* Time in seconds after which images should be removed from the cache |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8185 if not displayed. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8186 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8187 Lisp_Object Vimage_cache_eviction_delay; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8188 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8189 /* Function prototypes. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8190 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8191 static void define_image_type P_ ((struct image_type *type)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8192 static struct image_type *lookup_image_type P_ ((Lisp_Object symbol)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8193 static void image_error P_ ((char *format, Lisp_Object, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8194 static void x_laplace P_ ((struct frame *, struct image *)); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8195 static void x_emboss P_ ((struct frame *, struct image *)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8196 static int x_build_heuristic_mask P_ ((struct frame *, struct image *, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8197 Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8198 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8199 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8200 /* Define a new image type from TYPE. This adds a copy of TYPE to |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8201 image_types and adds the symbol *TYPE->type to Vimage_types. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8202 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8203 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8204 define_image_type (type) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8205 struct image_type *type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8206 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8207 /* Make a copy of TYPE to avoid a bus error in a dumped Emacs. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8208 The initialized data segment is read-only. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8209 struct image_type *p = (struct image_type *) xmalloc (sizeof *p); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8210 bcopy (type, p, sizeof *p); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8211 p->next = image_types; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8212 image_types = p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8213 Vimage_types = Fcons (*p->type, Vimage_types); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8214 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8215 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8216 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8217 /* Look up image type SYMBOL, and return a pointer to its image_type |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8218 structure. Value is null if SYMBOL is not a known image type. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8219 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8220 static INLINE struct image_type * |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8221 lookup_image_type (symbol) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8222 Lisp_Object symbol; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8223 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8224 struct image_type *type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8225 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8226 for (type = image_types; type; type = type->next) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8227 if (EQ (symbol, *type->type)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8228 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8229 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8230 return type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8231 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8232 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8233 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8234 /* Value is non-zero if OBJECT is a valid Lisp image specification. A |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8235 valid image specification is a list whose car is the symbol |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8236 `image', and whose rest is a property list. The property list must |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8237 contain a value for key `:type'. That value must be the name of a |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8238 supported image type. The rest of the property list depends on the |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8239 image type. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8240 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8241 int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8242 valid_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8243 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8244 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8245 int valid_p = 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8246 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8247 if (CONSP (object) && EQ (XCAR (object), Qimage)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8248 { |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8249 Lisp_Object tem; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8250 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8251 for (tem = XCDR (object); CONSP (tem); tem = XCDR (tem)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8252 if (EQ (XCAR (tem), QCtype)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8253 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8254 tem = XCDR (tem); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8255 if (CONSP (tem) && SYMBOLP (XCAR (tem))) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8256 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8257 struct image_type *type; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8258 type = lookup_image_type (XCAR (tem)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8259 if (type) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8260 valid_p = type->valid_p (object); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8261 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8262 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8263 break; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8264 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8265 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8266 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8267 return valid_p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8268 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8269 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8270 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8271 /* Log error message with format string FORMAT and argument ARG. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8272 Signaling an error, e.g. when an image cannot be loaded, is not a |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8273 good idea because this would interrupt redisplay, and the error |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8274 message display would lead to another redisplay. This function |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8275 therefore simply displays a message. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8276 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8277 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8278 image_error (format, arg1, arg2) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8279 char *format; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8280 Lisp_Object arg1, arg2; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8281 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8282 add_to_log (format, arg1, arg2); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8283 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8284 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8285 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8286 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8287 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8288 Image specifications |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8289 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8290 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8291 enum image_value_type |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8292 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8293 IMAGE_DONT_CHECK_VALUE_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8294 IMAGE_STRING_VALUE, |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8295 IMAGE_STRING_OR_NIL_VALUE, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8296 IMAGE_SYMBOL_VALUE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8297 IMAGE_POSITIVE_INTEGER_VALUE, |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
8298 IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8299 IMAGE_NON_NEGATIVE_INTEGER_VALUE, |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8300 IMAGE_ASCENT_VALUE, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8301 IMAGE_INTEGER_VALUE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8302 IMAGE_FUNCTION_VALUE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8303 IMAGE_NUMBER_VALUE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8304 IMAGE_BOOL_VALUE |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8305 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8306 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8307 /* Structure used when parsing image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8308 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8309 struct image_keyword |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8310 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8311 /* Name of keyword. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8312 char *name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8313 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8314 /* The type of value allowed. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8315 enum image_value_type type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8316 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8317 /* Non-zero means key must be present. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8318 int mandatory_p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8319 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8320 /* Used to recognize duplicate keywords in a property list. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8321 int count; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8322 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8323 /* The value that was found. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8324 Lisp_Object value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8325 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8326 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8327 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8328 static int parse_image_spec P_ ((Lisp_Object, struct image_keyword *, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8329 int, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8330 static Lisp_Object image_spec_value P_ ((Lisp_Object, Lisp_Object, int *)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8331 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8332 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8333 /* Parse image spec SPEC according to KEYWORDS. A valid image spec |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8334 has the format (image KEYWORD VALUE ...). One of the keyword/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8335 value pairs must be `:type TYPE'. KEYWORDS is a vector of |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8336 image_keywords structures of size NKEYWORDS describing other |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8337 allowed keyword/value pairs. Value is non-zero if SPEC is valid. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8338 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8339 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8340 parse_image_spec (spec, keywords, nkeywords, type) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8341 Lisp_Object spec; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8342 struct image_keyword *keywords; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8343 int nkeywords; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8344 Lisp_Object type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8345 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8346 int i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8347 Lisp_Object plist; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8348 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8349 if (!CONSP (spec) || !EQ (XCAR (spec), Qimage)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8350 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8351 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8352 plist = XCDR (spec); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8353 while (CONSP (plist)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8354 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8355 Lisp_Object key, value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8356 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8357 /* First element of a pair must be a symbol. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8358 key = XCAR (plist); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8359 plist = XCDR (plist); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8360 if (!SYMBOLP (key)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8361 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8362 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8363 /* There must follow a value. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8364 if (!CONSP (plist)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8365 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8366 value = XCAR (plist); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8367 plist = XCDR (plist); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8368 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8369 /* Find key in KEYWORDS. Error if not found. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8370 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:
46293
diff
changeset
|
8371 if (strcmp (keywords[i].name, SDATA (SYMBOL_NAME (key))) == 0) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8372 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8373 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8374 if (i == nkeywords) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8375 continue; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8376 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8377 /* Record that we recognized the keyword. If a keywords |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8378 was found more than once, it's an error. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8379 keywords[i].value = value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8380 ++keywords[i].count; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8381 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8382 if (keywords[i].count > 1) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8383 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8384 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8385 /* Check type of value against allowed type. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8386 switch (keywords[i].type) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8387 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8388 case IMAGE_STRING_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8389 if (!STRINGP (value)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8390 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8391 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8392 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8393 case IMAGE_STRING_OR_NIL_VALUE: |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8394 if (!STRINGP (value) && !NILP (value)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8395 return 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8396 break; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8397 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8398 case IMAGE_SYMBOL_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8399 if (!SYMBOLP (value)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8400 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8401 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8402 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8403 case IMAGE_POSITIVE_INTEGER_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8404 if (!INTEGERP (value) || XINT (value) <= 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8405 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8406 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8407 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
8408 case IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR: |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
8409 if (INTEGERP (value) && XINT (value) >= 0) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
8410 break; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
8411 if (CONSP (value) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
8412 && INTEGERP (XCAR (value)) && INTEGERP (XCDR (value)) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
8413 && XINT (XCAR (value)) >= 0 && XINT (XCDR (value)) >= 0) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
8414 break; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
8415 return 0; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
8416 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8417 case IMAGE_ASCENT_VALUE: |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8418 if (SYMBOLP (value) && EQ (value, Qcenter)) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8419 break; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8420 else if (INTEGERP (value) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8421 && XINT (value) >= 0 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8422 && XINT (value) <= 100) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8423 break; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8424 return 0; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8425 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8426 case IMAGE_NON_NEGATIVE_INTEGER_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8427 if (!INTEGERP (value) || XINT (value) < 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8428 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8429 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8430 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8431 case IMAGE_DONT_CHECK_VALUE_TYPE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8432 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8433 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8434 case IMAGE_FUNCTION_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8435 value = indirect_function (value); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8436 if (SUBRP (value) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8437 || COMPILEDP (value) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8438 || (CONSP (value) && EQ (XCAR (value), Qlambda))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8439 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8440 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8441 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8442 case IMAGE_NUMBER_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8443 if (!INTEGERP (value) && !FLOATP (value)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8444 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8445 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8446 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8447 case IMAGE_INTEGER_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8448 if (!INTEGERP (value)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8449 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8450 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8451 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8452 case IMAGE_BOOL_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8453 if (!NILP (value) && !EQ (value, Qt)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8454 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8455 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8456 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8457 default: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8458 abort (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8459 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8460 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8461 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8462 if (EQ (key, QCtype) && !EQ (type, value)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8463 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8464 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8465 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8466 /* Check that all mandatory fields are present. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8467 for (i = 0; i < nkeywords; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8468 if (keywords[i].mandatory_p && keywords[i].count == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8469 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8470 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8471 return NILP (plist); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8472 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8473 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8474 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8475 /* Return the value of KEY in image specification SPEC. Value is nil |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8476 if KEY is not present in SPEC. if FOUND is not null, set *FOUND |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8477 to 1 if KEY was found in SPEC, set it to 0 otherwise. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8478 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8479 static Lisp_Object |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8480 image_spec_value (spec, key, found) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8481 Lisp_Object spec, key; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8482 int *found; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8483 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8484 Lisp_Object tail; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8485 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8486 xassert (valid_image_p (spec)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8487 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8488 for (tail = XCDR (spec); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8489 CONSP (tail) && CONSP (XCDR (tail)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8490 tail = XCDR (XCDR (tail))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8491 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8492 if (EQ (XCAR (tail), key)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8493 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8494 if (found) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8495 *found = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8496 return XCAR (XCDR (tail)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8497 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8498 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8499 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8500 if (found) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8501 *found = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8502 return Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8503 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8504 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8505 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8506 DEFUN ("image-size", Fimage_size, Simage_size, 1, 3, 0, |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8507 doc: /* Return the size of image SPEC as pair (WIDTH . HEIGHT). |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8508 PIXELS non-nil means return the size in pixels, otherwise return the |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8509 size in canonical character units. |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8510 FRAME is the frame on which the image will be displayed. FRAME nil |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8511 or omitted means use the selected frame. */) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8512 (spec, pixels, frame) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8513 Lisp_Object spec, pixels, frame; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8514 { |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8515 Lisp_Object size; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8516 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8517 size = Qnil; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8518 if (valid_image_p (spec)) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8519 { |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8520 struct frame *f = check_x_frame (frame); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8521 int id = lookup_image (f, spec); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8522 struct image *img = IMAGE_FROM_ID (f, id); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8523 int width = img->width + 2 * img->hmargin; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8524 int height = img->height + 2 * img->vmargin; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8525 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8526 if (NILP (pixels)) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8527 size = Fcons (make_float ((double) width / CANON_X_UNIT (f)), |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8528 make_float ((double) height / CANON_Y_UNIT (f))); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8529 else |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8530 size = Fcons (make_number (width), make_number (height)); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8531 } |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8532 else |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8533 error ("Invalid image specification"); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8534 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8535 return size; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8536 } |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8537 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8538 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8539 DEFUN ("image-mask-p", Fimage_mask_p, Simage_mask_p, 1, 2, 0, |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8540 doc: /* Return t if image SPEC has a mask bitmap. |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8541 FRAME is the frame on which the image will be displayed. FRAME nil |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8542 or omitted means use the selected frame. */) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8543 (spec, frame) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8544 Lisp_Object spec, frame; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8545 { |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8546 Lisp_Object mask; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8547 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8548 mask = Qnil; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8549 if (valid_image_p (spec)) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8550 { |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8551 struct frame *f = check_x_frame (frame); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8552 int id = lookup_image (f, spec); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8553 struct image *img = IMAGE_FROM_ID (f, id); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8554 if (img->mask) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8555 mask = Qt; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8556 } |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8557 else |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8558 error ("Invalid image specification"); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8559 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8560 return mask; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8561 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8562 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8563 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8564 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8565 Image type independent image structures |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8566 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8567 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8568 static struct image *make_image P_ ((Lisp_Object spec, unsigned hash)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8569 static void free_image P_ ((struct frame *f, struct image *img)); |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8570 static void x_destroy_x_image P_ ((XImage *)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8571 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8572 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8573 /* Allocate and return a new image structure for image specification |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8574 SPEC. SPEC has a hash value of HASH. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8575 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8576 static struct image * |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8577 make_image (spec, hash) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8578 Lisp_Object spec; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8579 unsigned hash; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8580 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8581 struct image *img = (struct image *) xmalloc (sizeof *img); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8582 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8583 xassert (valid_image_p (spec)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8584 bzero (img, sizeof *img); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8585 img->type = lookup_image_type (image_spec_value (spec, QCtype, NULL)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8586 xassert (img->type != NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8587 img->spec = spec; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8588 img->data.lisp_val = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8589 img->ascent = DEFAULT_IMAGE_ASCENT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8590 img->hash = hash; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8591 return img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8592 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8593 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8594 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8595 /* Free image IMG which was used on frame F, including its resources. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8596 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8597 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8598 free_image (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8599 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8600 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8601 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8602 if (img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8603 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8604 struct image_cache *c = FRAME_X_IMAGE_CACHE (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8605 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8606 /* Remove IMG from the hash table of its cache. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8607 if (img->prev) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8608 img->prev->next = img->next; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8609 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8610 c->buckets[img->hash % IMAGE_CACHE_BUCKETS_SIZE] = img->next; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8611 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8612 if (img->next) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8613 img->next->prev = img->prev; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8614 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8615 c->images[img->id] = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8616 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8617 /* Free resources, then free IMG. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8618 img->type->free (f, img); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8619 xfree (img); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8620 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8621 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8622 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8623 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8624 /* Prepare image IMG for display on frame F. Must be called before |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8625 drawing an image. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8626 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8627 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8628 prepare_image_for_display (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8629 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8630 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8631 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8632 EMACS_TIME t; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8633 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8634 /* We're about to display IMG, so set its timestamp to `now'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8635 EMACS_GET_TIME (t); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8636 img->timestamp = EMACS_SECS (t); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8637 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8638 /* If IMG doesn't have a pixmap yet, load it now, using the image |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8639 type dependent loader function. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8640 if (img->pixmap == 0 && !img->load_failed_p) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8641 img->load_failed_p = img->type->load (f, img) == 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8642 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8643 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8644 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8645 /* Value is the number of pixels for the ascent of image IMG when |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8646 drawn in face FACE. */ |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8647 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8648 int |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8649 image_ascent (img, face) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8650 struct image *img; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8651 struct face *face; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8652 { |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
8653 int height = img->height + img->vmargin; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8654 int ascent; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8655 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8656 if (img->ascent == CENTERED_IMAGE_ASCENT) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8657 { |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8658 if (face->font) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8659 ascent = height / 2 - (FONT_DESCENT(face->font) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8660 - FONT_BASE(face->font)) / 2; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8661 else |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8662 ascent = height / 2; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8663 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8664 else |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8665 ascent = (int) (height * img->ascent / 100.0); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8666 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8667 return ascent; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8668 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8669 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8670 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8671 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8672 /* Image background colors. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8673 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8674 /* Find the "best" corner color of a bitmap. XIMG is assumed to a device |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8675 context with the bitmap selected. */ |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8676 static COLORREF |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8677 four_corners_best (img_dc, width, height) |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8678 HDC img_dc; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8679 unsigned long width, height; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8680 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8681 COLORREF corners[4], best; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8682 int i, best_count; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8683 |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8684 /* Get the colors at the corners of img_dc. */ |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8685 corners[0] = GetPixel (img_dc, 0, 0); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8686 corners[1] = GetPixel (img_dc, width - 1, 0); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8687 corners[2] = GetPixel (img_dc, width - 1, height - 1); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8688 corners[3] = GetPixel (img_dc, 0, height - 1); |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8689 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8690 /* Choose the most frequently found color as background. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8691 for (i = best_count = 0; i < 4; ++i) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8692 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8693 int j, n; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8694 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8695 for (j = n = 0; j < 4; ++j) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8696 if (corners[i] == corners[j]) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8697 ++n; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8698 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8699 if (n > best_count) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8700 best = corners[i], best_count = n; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8701 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8702 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8703 return best; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8704 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8705 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8706 /* Return the `background' field of IMG. If IMG doesn't have one yet, |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8707 it is guessed heuristically. If non-zero, IMG_DC is an existing |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8708 device context with the image selected to use for the heuristic. */ |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8709 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8710 unsigned long |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8711 image_background (img, f, img_dc) |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8712 struct image *img; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8713 struct frame *f; |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8714 HDC img_dc; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8715 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8716 if (! img->background_valid) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8717 /* IMG doesn't have a background yet, try to guess a reasonable value. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8718 { |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8719 int free_ximg = !img_dc; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8720 HGDIOBJ prev; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8721 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8722 if (free_ximg) |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8723 { |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8724 HDC frame_dc = get_frame_dc (f); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8725 img_dc = CreateCompatibleDC (frame_dc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8726 release_frame_dc (f, frame_dc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8727 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8728 prev = SelectObject (img_dc, img->pixmap); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8729 } |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8730 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8731 img->background = four_corners_best (img_dc, img->width, img->height); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8732 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8733 if (free_ximg) |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8734 { |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8735 SelectObject (img_dc, prev); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8736 DeleteDC (img_dc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8737 } |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8738 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8739 img->background_valid = 1; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8740 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8741 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8742 return img->background; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8743 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8744 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8745 /* Return the `background_transparent' field of IMG. If IMG doesn't |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8746 have one yet, it is guessed heuristically. If non-zero, MASK is an |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8747 existing XImage object to use for the heuristic. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8748 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8749 int |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8750 image_background_transparent (img, f, mask) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8751 struct image *img; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8752 struct frame *f; |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8753 HDC mask; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8754 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8755 if (! img->background_transparent_valid) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8756 /* IMG doesn't have a background yet, try to guess a reasonable value. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8757 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8758 if (img->mask) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8759 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8760 int free_mask = !mask; |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8761 HGDIOBJ prev; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8762 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8763 if (free_mask) |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8764 { |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8765 HDC frame_dc = get_frame_dc (f); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8766 mask = CreateCompatibleDC (frame_dc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8767 release_frame_dc (f, frame_dc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8768 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8769 prev = SelectObject (mask, img->mask); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8770 } |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8771 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8772 img->background_transparent |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8773 = !four_corners_best (mask, img->width, img->height); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8774 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8775 if (free_mask) |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8776 { |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8777 SelectObject (mask, prev); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8778 DeleteDC (mask); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8779 } |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8780 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8781 else |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8782 img->background_transparent = 0; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8783 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8784 img->background_transparent_valid = 1; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8785 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8786 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8787 return img->background_transparent; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8788 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8789 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8790 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8791 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8792 Helper functions for X image types |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8793 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8794 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8795 static void x_clear_image_1 P_ ((struct frame *, struct image *, int, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8796 int, int)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8797 static void x_clear_image P_ ((struct frame *f, struct image *img)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8798 static unsigned long x_alloc_image_color P_ ((struct frame *f, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8799 struct image *img, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8800 Lisp_Object color_name, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8801 unsigned long dflt)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8802 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8803 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8804 /* Clear X resources of image IMG on frame F. PIXMAP_P non-zero means |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8805 free the pixmap if any. MASK_P non-zero means clear the mask |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8806 pixmap if any. COLORS_P non-zero means free colors allocated for |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8807 the image, if any. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8808 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8809 static void |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8810 x_clear_image_1 (f, img, pixmap_p, mask_p, colors_p) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8811 struct frame *f; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8812 struct image *img; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8813 int pixmap_p, mask_p, colors_p; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8814 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8815 if (pixmap_p && img->pixmap) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8816 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8817 DeleteObject (img->pixmap); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8818 img->pixmap = NULL; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8819 img->background_valid = 0; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8820 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8821 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8822 if (mask_p && img->mask) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8823 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8824 DeleteObject (img->mask); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8825 img->mask = NULL; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8826 img->background_transparent_valid = 0; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8827 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8828 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8829 if (colors_p && img->ncolors) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8830 { |
44076
13f77e440e6e
(x_clear_image_1): Disable color table code.
Jason Rumney <jasonr@gnu.org>
parents:
44068
diff
changeset
|
8831 #if 0 /* TODO: color table support. */ |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8832 x_free_colors (f, img->colors, img->ncolors); |
44076
13f77e440e6e
(x_clear_image_1): Disable color table code.
Jason Rumney <jasonr@gnu.org>
parents:
44068
diff
changeset
|
8833 #endif |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8834 xfree (img->colors); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8835 img->colors = NULL; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8836 img->ncolors = 0; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8837 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8838 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8839 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8840 /* Free X resources of image IMG which is used on frame F. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8841 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8842 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8843 x_clear_image (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8844 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8845 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8846 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8847 if (img->pixmap) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8848 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8849 BLOCK_INPUT; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8850 DeleteObject (img->pixmap); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8851 img->pixmap = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8852 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8853 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8854 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8855 if (img->ncolors) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8856 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8857 #if 0 /* TODO: color table support */ |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8858 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8859 int class = FRAME_W32_DISPLAY_INFO (f)->visual->class; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8860 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8861 /* If display has an immutable color map, freeing colors is not |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8862 necessary and some servers don't allow it. So don't do it. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8863 if (class != StaticColor |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8864 && class != StaticGray |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8865 && class != TrueColor) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8866 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8867 Colormap cmap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8868 BLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8869 cmap = DefaultColormapOfScreen (FRAME_W32_DISPLAY_INFO (f)->screen); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8870 XFreeColors (FRAME_W32_DISPLAY (f), cmap, img->colors, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8871 img->ncolors, 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8872 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8873 } |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8874 #endif |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8875 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8876 xfree (img->colors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8877 img->colors = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8878 img->ncolors = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8879 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8880 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8881 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8882 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8883 /* Allocate color COLOR_NAME for image IMG on frame F. If color |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8884 cannot be allocated, use DFLT. Add a newly allocated color to |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8885 IMG->colors, so that it can be freed again. Value is the pixel |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8886 color. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8887 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8888 static unsigned long |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8889 x_alloc_image_color (f, img, color_name, dflt) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8890 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8891 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8892 Lisp_Object color_name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8893 unsigned long dflt; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8894 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8895 XColor color; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8896 unsigned long result; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8897 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8898 xassert (STRINGP (color_name)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8899 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
8900 if (w32_defined_color (f, SDATA (color_name), &color, 1)) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8901 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8902 /* This isn't called frequently so we get away with simply |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8903 reallocating the color vector to the needed size, here. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8904 ++img->ncolors; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8905 img->colors = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8906 (unsigned long *) xrealloc (img->colors, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8907 img->ncolors * sizeof *img->colors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8908 img->colors[img->ncolors - 1] = color.pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8909 result = color.pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8910 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8911 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8912 result = dflt; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8913 return result; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8914 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8915 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8916 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8917 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8918 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8919 Image Cache |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8920 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8921 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8922 static void cache_image P_ ((struct frame *f, struct image *img)); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8923 static void postprocess_image P_ ((struct frame *, struct image *)); |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8924 static void x_disable_image P_ ((struct frame *, struct image *)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8925 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8926 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8927 /* Return a new, initialized image cache that is allocated from the |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8928 heap. Call free_image_cache to free an image cache. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8929 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8930 struct image_cache * |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8931 make_image_cache () |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8932 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8933 struct image_cache *c = (struct image_cache *) xmalloc (sizeof *c); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8934 int size; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8935 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8936 bzero (c, sizeof *c); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8937 c->size = 50; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8938 c->images = (struct image **) xmalloc (c->size * sizeof *c->images); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8939 size = IMAGE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8940 c->buckets = (struct image **) xmalloc (size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8941 bzero (c->buckets, size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8942 return c; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8943 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8944 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8945 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8946 /* Free image cache of frame F. Be aware that X frames share images |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8947 caches. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8948 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8949 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8950 free_image_cache (f) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8951 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8952 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8953 struct image_cache *c = FRAME_X_IMAGE_CACHE (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8954 if (c) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8955 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8956 int i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8957 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8958 /* Cache should not be referenced by any frame when freed. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8959 xassert (c->refcount == 0); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8960 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8961 for (i = 0; i < c->used; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8962 free_image (f, c->images[i]); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8963 xfree (c->images); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8964 xfree (c); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8965 xfree (c->buckets); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8966 FRAME_X_IMAGE_CACHE (f) = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8967 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8968 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8969 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8970 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8971 /* Clear image cache of frame F. FORCE_P non-zero means free all |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8972 images. FORCE_P zero means clear only images that haven't been |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8973 displayed for some time. Should be called from time to time to |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8974 reduce the number of loaded images. If image-eviction-seconds is |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
8975 non-nil, this frees images in the cache which weren't displayed for |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8976 at least that many seconds. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8977 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8978 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8979 clear_image_cache (f, force_p) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8980 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8981 int force_p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8982 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8983 struct image_cache *c = FRAME_X_IMAGE_CACHE (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8984 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8985 if (c && INTEGERP (Vimage_cache_eviction_delay)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8986 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8987 EMACS_TIME t; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8988 unsigned long old; |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
8989 int i, nfreed; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8990 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8991 EMACS_GET_TIME (t); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8992 old = EMACS_SECS (t) - XFASTINT (Vimage_cache_eviction_delay); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8993 |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
8994 /* Block input so that we won't be interrupted by a SIGIO |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
8995 while being in an inconsistent state. */ |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
8996 BLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8997 |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
8998 for (i = nfreed = 0; i < c->used; ++i) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8999 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9000 struct image *img = c->images[i]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9001 if (img != NULL |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9002 && (force_p || (img->timestamp < old))) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9003 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9004 free_image (f, img); |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9005 ++nfreed; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9006 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9007 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9008 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9009 /* We may be clearing the image cache because, for example, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9010 Emacs was iconified for a longer period of time. In that |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9011 case, current matrices may still contain references to |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9012 images freed above. So, clear these matrices. */ |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9013 if (nfreed) |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9014 { |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9015 Lisp_Object tail, frame; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9016 |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9017 FOR_EACH_FRAME (tail, frame) |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9018 { |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9019 struct frame *f = XFRAME (frame); |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9020 if (FRAME_W32_P (f) |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9021 && FRAME_X_IMAGE_CACHE (f) == c) |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9022 clear_current_matrices (f); |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9023 } |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9024 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9025 ++windows_or_buffers_changed; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9026 } |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9027 |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
9028 UNBLOCK_INPUT; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9029 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9030 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9031 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9032 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9033 DEFUN ("clear-image-cache", Fclear_image_cache, Sclear_image_cache, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9034 0, 1, 0, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
9035 doc: /* Clear the image cache of FRAME. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
9036 FRAME nil or omitted means use the selected frame. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
9037 FRAME t means clear the image caches of all frames. */) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9038 (frame) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9039 Lisp_Object frame; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9040 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9041 if (EQ (frame, Qt)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9042 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9043 Lisp_Object tail; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9044 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9045 FOR_EACH_FRAME (tail, frame) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9046 if (FRAME_W32_P (XFRAME (frame))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9047 clear_image_cache (XFRAME (frame), 1); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9048 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9049 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9050 clear_image_cache (check_x_frame (frame), 1); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9051 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9052 return Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9053 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9054 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9055 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9056 /* Compute masks and transform image IMG on frame F, as specified |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9057 by the image's specification, */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9058 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9059 static void |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9060 postprocess_image (f, img) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9061 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9062 struct image *img; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9063 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9064 /* Manipulation of the image's mask. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9065 if (img->pixmap) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9066 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9067 Lisp_Object conversion, spec; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9068 Lisp_Object mask; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9069 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9070 spec = img->spec; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9071 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9072 /* `:heuristic-mask t' |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9073 `:mask heuristic' |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9074 means build a mask heuristically. |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9075 `:heuristic-mask (R G B)' |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9076 `:mask (heuristic (R G B))' |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9077 means build a mask from color (R G B) in the |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9078 image. |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9079 `:mask nil' |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9080 means remove a mask, if any. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9081 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9082 mask = image_spec_value (spec, QCheuristic_mask, NULL); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9083 if (!NILP (mask)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9084 x_build_heuristic_mask (f, img, mask); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9085 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9086 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9087 int found_p; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9088 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9089 mask = image_spec_value (spec, QCmask, &found_p); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9090 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9091 if (EQ (mask, Qheuristic)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9092 x_build_heuristic_mask (f, img, Qt); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9093 else if (CONSP (mask) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9094 && EQ (XCAR (mask), Qheuristic)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9095 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9096 if (CONSP (XCDR (mask))) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9097 x_build_heuristic_mask (f, img, XCAR (XCDR (mask))); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9098 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9099 x_build_heuristic_mask (f, img, XCDR (mask)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9100 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9101 else if (NILP (mask) && found_p && img->mask) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9102 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9103 DeleteObject (img->mask); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9104 img->mask = NULL; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9105 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9106 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9107 |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9108 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9109 /* Should we apply an image transformation algorithm? */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9110 conversion = image_spec_value (spec, QCconversion, NULL); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9111 if (EQ (conversion, Qdisabled)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9112 x_disable_image (f, img); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9113 else if (EQ (conversion, Qlaplace)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9114 x_laplace (f, img); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9115 else if (EQ (conversion, Qemboss)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9116 x_emboss (f, img); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9117 else if (CONSP (conversion) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9118 && EQ (XCAR (conversion), Qedge_detection)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9119 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9120 Lisp_Object tem; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9121 tem = XCDR (conversion); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9122 if (CONSP (tem)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9123 x_edge_detection (f, img, |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9124 Fplist_get (tem, QCmatrix), |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9125 Fplist_get (tem, QCcolor_adjustment)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9126 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9127 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9128 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9129 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9130 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9131 /* Return the id of image with Lisp specification SPEC on frame F. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9132 SPEC must be a valid Lisp image specification (see valid_image_p). */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9133 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9134 int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9135 lookup_image (f, spec) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9136 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9137 Lisp_Object spec; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9138 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9139 struct image_cache *c = FRAME_X_IMAGE_CACHE (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9140 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9141 int i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9142 unsigned hash; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9143 struct gcpro gcpro1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9144 EMACS_TIME now; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9145 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9146 /* F must be a window-system frame, and SPEC must be a valid image |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9147 specification. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9148 xassert (FRAME_WINDOW_P (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9149 xassert (valid_image_p (spec)); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9150 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9151 GCPRO1 (spec); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9152 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9153 /* Look up SPEC in the hash table of the image cache. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9154 hash = sxhash (spec, 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9155 i = hash % IMAGE_CACHE_BUCKETS_SIZE; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9156 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9157 for (img = c->buckets[i]; img; img = img->next) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9158 if (img->hash == hash && !NILP (Fequal (img->spec, spec))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9159 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9160 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9161 /* If not found, create a new image and cache it. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9162 if (img == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9163 { |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9164 extern Lisp_Object Qpostscript; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9165 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9166 BLOCK_INPUT; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9167 img = make_image (spec, hash); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9168 cache_image (f, img); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9169 img->load_failed_p = img->type->load (f, img) == 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9170 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9171 /* If we can't load the image, and we don't have a width and |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9172 height, use some arbitrary width and height so that we can |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9173 draw a rectangle for it. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9174 if (img->load_failed_p) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9175 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9176 Lisp_Object value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9177 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9178 value = image_spec_value (spec, QCwidth, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9179 img->width = (INTEGERP (value) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9180 ? XFASTINT (value) : DEFAULT_IMAGE_WIDTH); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9181 value = image_spec_value (spec, QCheight, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9182 img->height = (INTEGERP (value) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9183 ? XFASTINT (value) : DEFAULT_IMAGE_HEIGHT); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9184 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9185 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9186 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9187 /* Handle image type independent image attributes |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
9188 `:ascent ASCENT', `:margin MARGIN', `:relief RELIEF', |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9189 `:background COLOR'. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9190 Lisp_Object ascent, margin, relief, bg; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9191 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9192 ascent = image_spec_value (spec, QCascent, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9193 if (INTEGERP (ascent)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9194 img->ascent = XFASTINT (ascent); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
9195 else if (EQ (ascent, Qcenter)) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
9196 img->ascent = CENTERED_IMAGE_ASCENT; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
9197 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9198 margin = image_spec_value (spec, QCmargin, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9199 if (INTEGERP (margin) && XINT (margin) >= 0) |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9200 img->vmargin = img->hmargin = XFASTINT (margin); |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9201 else if (CONSP (margin) && INTEGERP (XCAR (margin)) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9202 && INTEGERP (XCDR (margin))) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9203 { |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9204 if (XINT (XCAR (margin)) > 0) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9205 img->hmargin = XFASTINT (XCAR (margin)); |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9206 if (XINT (XCDR (margin)) > 0) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9207 img->vmargin = XFASTINT (XCDR (margin)); |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9208 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9209 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9210 relief = image_spec_value (spec, QCrelief, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9211 if (INTEGERP (relief)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9212 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9213 img->relief = XINT (relief); |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9214 img->hmargin += abs (img->relief); |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9215 img->vmargin += abs (img->relief); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9216 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9217 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9218 if (! img->background_valid) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9219 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9220 bg = image_spec_value (img->spec, QCbackground, NULL); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9221 if (!NILP (bg)) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9222 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9223 img->background |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9224 = x_alloc_image_color (f, img, bg, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9225 FRAME_BACKGROUND_PIXEL (f)); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9226 img->background_valid = 1; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9227 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9228 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9229 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9230 /* Do image transformations and compute masks, unless we |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9231 don't have the image yet. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9232 if (!EQ (*img->type->type, Qpostscript)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9233 postprocess_image (f, img); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9234 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9235 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9236 UNBLOCK_INPUT; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9237 xassert (!interrupt_input_blocked); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9238 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9239 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9240 /* We're using IMG, so set its timestamp to `now'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9241 EMACS_GET_TIME (now); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9242 img->timestamp = EMACS_SECS (now); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9243 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9244 UNGCPRO; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9245 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9246 /* Value is the image id. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9247 return img->id; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9248 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9249 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9250 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9251 /* Cache image IMG in the image cache of frame F. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9252 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9253 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9254 cache_image (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9255 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9256 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9257 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9258 struct image_cache *c = FRAME_X_IMAGE_CACHE (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9259 int i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9260 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9261 /* Find a free slot in c->images. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9262 for (i = 0; i < c->used; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9263 if (c->images[i] == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9264 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9265 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9266 /* If no free slot found, maybe enlarge c->images. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9267 if (i == c->used && c->used == c->size) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9268 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9269 c->size *= 2; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9270 c->images = (struct image **) xrealloc (c->images, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9271 c->size * sizeof *c->images); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9272 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9273 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9274 /* Add IMG to c->images, and assign IMG an id. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9275 c->images[i] = img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9276 img->id = i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9277 if (i == c->used) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9278 ++c->used; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9279 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9280 /* Add IMG to the cache's hash table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9281 i = img->hash % IMAGE_CACHE_BUCKETS_SIZE; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9282 img->next = c->buckets[i]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9283 if (img->next) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9284 img->next->prev = img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9285 img->prev = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9286 c->buckets[i] = img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9287 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9288 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9289 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9290 /* Call FN on every image in the image cache of frame F. Used to mark |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9291 Lisp Objects in the image cache. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9292 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9293 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9294 forall_images_in_image_cache (f, fn) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9295 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9296 void (*fn) P_ ((struct image *img)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9297 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9298 if (FRAME_LIVE_P (f) && FRAME_W32_P (f)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9299 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9300 struct image_cache *c = FRAME_X_IMAGE_CACHE (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9301 if (c) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9302 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9303 int i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9304 for (i = 0; i < c->used; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9305 if (c->images[i]) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9306 fn (c->images[i]); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9307 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9308 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9309 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9310 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9311 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9312 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9313 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9314 W32 support code |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9315 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9316 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9317 static int x_create_x_image_and_pixmap P_ ((struct frame *, int, int, int, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9318 XImage **, Pixmap *)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9319 static void x_put_x_image P_ ((struct frame *, XImage *, Pixmap, int, int)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9320 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9321 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9322 /* Create an XImage and a pixmap of size WIDTH x HEIGHT for use on |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9323 frame F. Set *XIMG and *PIXMAP to the XImage and Pixmap created. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9324 Set (*XIMG)->data to a raster of WIDTH x HEIGHT pixels allocated |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9325 via xmalloc. DEPTH of zero signifies a 24 bit image, otherwise |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9326 DEPTH should indicate the bit depth of the image. Print error |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9327 messages via image_error if an error occurs. Value is non-zero if |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9328 successful. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9329 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9330 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9331 x_create_x_image_and_pixmap (f, width, height, depth, ximg, pixmap) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9332 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9333 int width, height, depth; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9334 XImage **ximg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9335 Pixmap *pixmap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9336 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9337 BITMAPINFOHEADER *header; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9338 HDC hdc; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9339 int scanline_width_bits; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9340 int remainder; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9341 int palette_colors = 0; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9342 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9343 if (depth == 0) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9344 depth = 24; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9345 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9346 if (depth != 1 && depth != 4 && depth != 8 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9347 && depth != 16 && depth != 24 && depth != 32) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9348 { |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9349 image_error ("Invalid image bit depth specified", Qnil, Qnil); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9350 return 0; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9351 } |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9352 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9353 scanline_width_bits = width * depth; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9354 remainder = scanline_width_bits % 32; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9355 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9356 if (remainder) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9357 scanline_width_bits += 32 - remainder; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9358 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9359 /* Bitmaps with a depth less than 16 need a palette. */ |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9360 /* BITMAPINFO structure already contains the first RGBQUAD. */ |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9361 if (depth < 16) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9362 palette_colors = 1 << depth - 1; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9363 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9364 *ximg = xmalloc (sizeof (XImage) + palette_colors * sizeof (RGBQUAD)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9365 if (*ximg == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9366 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9367 image_error ("Unable to allocate memory for XImage", Qnil, Qnil); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9368 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9369 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9370 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9371 header = &((*ximg)->info.bmiHeader); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9372 bzero (&((*ximg)->info), sizeof (BITMAPINFO)); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9373 header->biSize = sizeof (*header); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9374 header->biWidth = width; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9375 header->biHeight = -height; /* negative indicates a top-down bitmap. */ |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9376 header->biPlanes = 1; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9377 header->biBitCount = depth; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9378 header->biCompression = BI_RGB; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9379 header->biClrUsed = palette_colors; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9380 |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9381 /* TODO: fill in palette. */ |
48351
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
9382 if (depth == 1) |
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
9383 { |
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
9384 (*ximg)->info.bmiColors[0].rgbBlue = 0; |
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
9385 (*ximg)->info.bmiColors[0].rgbGreen = 0; |
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
9386 (*ximg)->info.bmiColors[0].rgbRed = 0; |
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
9387 (*ximg)->info.bmiColors[0].rgbReserved = 0; |
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
9388 (*ximg)->info.bmiColors[1].rgbBlue = 255; |
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
9389 (*ximg)->info.bmiColors[1].rgbGreen = 255; |
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
9390 (*ximg)->info.bmiColors[1].rgbRed = 255; |
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
9391 (*ximg)->info.bmiColors[1].rgbReserved = 0; |
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
9392 } |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9393 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9394 hdc = get_frame_dc (f); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9395 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9396 /* Create a DIBSection and raster array for the bitmap, |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9397 and store its handle in *pixmap. */ |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9398 *pixmap = CreateDIBSection (hdc, &((*ximg)->info), |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9399 (depth < 16) ? DIB_PAL_COLORS : DIB_RGB_COLORS, |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9400 &((*ximg)->data), NULL, 0); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9401 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9402 /* Realize display palette and garbage all frames. */ |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9403 release_frame_dc (f, hdc); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9404 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9405 if (*pixmap == NULL) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9406 { |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9407 DWORD err = GetLastError(); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9408 Lisp_Object errcode; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9409 /* All system errors are < 10000, so the following is safe. */ |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9410 XSETINT (errcode, (int) err); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9411 image_error ("Unable to create bitmap, error code %d", errcode, Qnil); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9412 x_destroy_x_image (*ximg); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9413 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9414 } |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9415 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9416 return 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9417 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9418 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9419 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9420 /* Destroy XImage XIMG. Free XIMG->data. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9421 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9422 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9423 x_destroy_x_image (ximg) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9424 XImage *ximg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9425 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9426 xassert (interrupt_input_blocked); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9427 if (ximg) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9428 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9429 /* Data will be freed by DestroyObject. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9430 ximg->data = NULL; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9431 xfree (ximg); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9432 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9433 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9434 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9435 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9436 /* Put XImage XIMG into pixmap PIXMAP on frame F. WIDTH and HEIGHT |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9437 are width and height of both the image and pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9438 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9439 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9440 x_put_x_image (f, ximg, pixmap, width, height) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9441 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9442 XImage *ximg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9443 Pixmap pixmap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9444 { |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9445 #if 0 /* I don't think this is necessary looking at where it is used. */ |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9446 HDC hdc = get_frame_dc (f); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9447 SetDIBits (hdc, pixmap, 0, height, ximg->data, &(ximg->info), DIB_RGB_COLORS); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9448 release_frame_dc (f, hdc); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9449 #endif |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9450 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9451 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9452 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9453 /*********************************************************************** |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9454 File Handling |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9455 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9456 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9457 static Lisp_Object x_find_image_file P_ ((Lisp_Object)); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9458 static char *slurp_file P_ ((char *, int *)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9459 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9460 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9461 /* Find image file FILE. Look in data-directory, then |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9462 x-bitmap-file-path. Value is the full name of the file found, or |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9463 nil if not found. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9464 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9465 static Lisp_Object |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9466 x_find_image_file (file) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9467 Lisp_Object file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9468 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9469 Lisp_Object file_found, search_path; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9470 struct gcpro gcpro1, gcpro2; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9471 int fd; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9472 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9473 file_found = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9474 search_path = Fcons (Vdata_directory, Vx_bitmap_file_path); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9475 GCPRO2 (file_found, search_path); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9476 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9477 /* 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:
44642
diff
changeset
|
9478 fd = openp (search_path, file, Qnil, &file_found, Qnil); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9479 |
33443
2c60aa5cd386
(x_create_bitmap_from_file, x_find_image_file): Use new openp return protocol.
Miles Bader <miles@gnu.org>
parents:
33387
diff
changeset
|
9480 if (fd == -1) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9481 file_found = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9482 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9483 close (fd); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9484 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9485 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9486 return file_found; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9487 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9488 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9489 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9490 /* Read FILE into memory. Value is a pointer to a buffer allocated |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9491 with xmalloc holding FILE's contents. Value is null if an error |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9492 occurred. *SIZE is set to the size of the file. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9493 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9494 static char * |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9495 slurp_file (file, size) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9496 char *file; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9497 int *size; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9498 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9499 FILE *fp = NULL; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9500 char *buf = NULL; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9501 struct stat st; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9502 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9503 if (stat (file, &st) == 0 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9504 && (fp = fopen (file, "r")) != NULL |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9505 && (buf = (char *) xmalloc (st.st_size), |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9506 fread (buf, 1, st.st_size, fp) == st.st_size)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9507 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9508 *size = st.st_size; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9509 fclose (fp); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9510 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9511 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9512 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9513 if (fp) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9514 fclose (fp); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9515 if (buf) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9516 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9517 xfree (buf); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9518 buf = NULL; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9519 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9520 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9521 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9522 return buf; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9523 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9524 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9525 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9526 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9527 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9528 XBM images |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9529 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9530 |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9531 static int xbm_scan P_ ((char **, char *, char *, int *)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9532 static int xbm_load P_ ((struct frame *f, struct image *img)); |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9533 static int xbm_load_image P_ ((struct frame *f, struct image *img, |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9534 char *, char *)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9535 static int xbm_image_p P_ ((Lisp_Object object)); |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9536 static int xbm_read_bitmap_data P_ ((char *, char *, int *, int *, |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9537 unsigned char **)); |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9538 static int xbm_file_p P_ ((Lisp_Object)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9539 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9540 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9541 /* Indices of image specification fields in xbm_format, below. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9542 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9543 enum xbm_keyword_index |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9544 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9545 XBM_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9546 XBM_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9547 XBM_WIDTH, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9548 XBM_HEIGHT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9549 XBM_DATA, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9550 XBM_FOREGROUND, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9551 XBM_BACKGROUND, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9552 XBM_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9553 XBM_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9554 XBM_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9555 XBM_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9556 XBM_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9557 XBM_MASK, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9558 XBM_LAST |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9559 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9560 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9561 /* Vector of image_keyword structures describing the format |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9562 of valid XBM image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9563 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9564 static struct image_keyword xbm_format[XBM_LAST] = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9565 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9566 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9567 {":file", IMAGE_STRING_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9568 {":width", IMAGE_POSITIVE_INTEGER_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9569 {":height", IMAGE_POSITIVE_INTEGER_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9570 {":data", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9571 {":foreground", IMAGE_STRING_OR_NIL_VALUE, 0}, |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9572 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}, |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9573 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
9574 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9575 {":relief", IMAGE_INTEGER_VALUE, 0}, |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
9576 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9577 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9578 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0} |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9579 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9580 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9581 /* Structure describing the image type XBM. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9582 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9583 static struct image_type xbm_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9584 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9585 &Qxbm, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9586 xbm_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9587 xbm_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9588 x_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9589 NULL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9590 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9591 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9592 /* Tokens returned from xbm_scan. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9593 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9594 enum xbm_token |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9595 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9596 XBM_TK_IDENT = 256, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9597 XBM_TK_NUMBER |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9598 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9599 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9600 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9601 /* Return non-zero if OBJECT is a valid XBM-type image specification. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9602 A valid specification is a list starting with the symbol `image' |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9603 The rest of the list is a property list which must contain an |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9604 entry `:type xbm.. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9605 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9606 If the specification specifies a file to load, it must contain |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9607 an entry `:file FILENAME' where FILENAME is a string. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9608 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9609 If the specification is for a bitmap loaded from memory it must |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9610 contain `:width WIDTH', `:height HEIGHT', and `:data DATA', where |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9611 WIDTH and HEIGHT are integers > 0. DATA may be: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9612 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9613 1. a string large enough to hold the bitmap data, i.e. it must |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9614 have a size >= (WIDTH + 7) / 8 * HEIGHT |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9615 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9616 2. a bool-vector of size >= WIDTH * HEIGHT |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9617 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9618 3. a vector of strings or bool-vectors, one for each line of the |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9619 bitmap. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9620 |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9621 4. A string containing an in-memory XBM file. WIDTH and HEIGHT |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9622 may not be specified in this case because they are defined in the |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9623 XBM file. |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9624 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9625 Both the file and data forms may contain the additional entries |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9626 `:background COLOR' and `:foreground COLOR'. If not present, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9627 foreground and background of the frame on which the image is |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9628 displayed is used. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9629 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9630 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9631 xbm_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9632 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9633 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9634 struct image_keyword kw[XBM_LAST]; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9635 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9636 bcopy (xbm_format, kw, sizeof kw); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9637 if (!parse_image_spec (object, kw, XBM_LAST, Qxbm)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9638 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9639 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9640 xassert (EQ (kw[XBM_TYPE].value, Qxbm)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9641 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9642 if (kw[XBM_FILE].count) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9643 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9644 if (kw[XBM_WIDTH].count || kw[XBM_HEIGHT].count || kw[XBM_DATA].count) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9645 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9646 } |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9647 else if (kw[XBM_DATA].count && xbm_file_p (kw[XBM_DATA].value)) |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9648 { |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9649 /* In-memory XBM file. */ |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9650 if (kw[XBM_WIDTH].count || kw[XBM_HEIGHT].count || kw[XBM_FILE].count) |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9651 return 0; |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9652 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9653 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9654 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9655 Lisp_Object data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9656 int width, height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9657 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9658 /* Entries for `:width', `:height' and `:data' must be present. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9659 if (!kw[XBM_WIDTH].count |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9660 || !kw[XBM_HEIGHT].count |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9661 || !kw[XBM_DATA].count) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9662 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9663 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9664 data = kw[XBM_DATA].value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9665 width = XFASTINT (kw[XBM_WIDTH].value); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9666 height = XFASTINT (kw[XBM_HEIGHT].value); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9667 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9668 /* Check type of data, and width and height against contents of |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9669 data. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9670 if (VECTORP (data)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9671 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9672 int i; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9673 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9674 /* Number of elements of the vector must be >= height. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9675 if (XVECTOR (data)->size < height) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9676 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9677 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9678 /* Each string or bool-vector in data must be large enough |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9679 for one line of the image. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9680 for (i = 0; i < height; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9681 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9682 Lisp_Object elt = XVECTOR (data)->contents[i]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9683 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9684 if (STRINGP (elt)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9685 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
9686 if (SCHARS (elt) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9687 < (width + BITS_PER_CHAR - 1) / BITS_PER_CHAR) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9688 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9689 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9690 else if (BOOL_VECTOR_P (elt)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9691 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9692 if (XBOOL_VECTOR (elt)->size < width) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9693 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9694 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9695 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9696 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9697 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9698 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9699 else if (STRINGP (data)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9700 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
9701 if (SCHARS (data) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9702 < (width + BITS_PER_CHAR - 1) / BITS_PER_CHAR * height) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9703 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9704 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9705 else if (BOOL_VECTOR_P (data)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9706 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9707 if (XBOOL_VECTOR (data)->size < width * height) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9708 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9709 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9710 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9711 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9712 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9713 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9714 return 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9715 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9716 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9717 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9718 /* Scan a bitmap file. FP is the stream to read from. Value is |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9719 either an enumerator from enum xbm_token, or a character for a |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9720 single-character token, or 0 at end of file. If scanning an |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9721 identifier, store the lexeme of the identifier in SVAL. If |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9722 scanning a number, store its value in *IVAL. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9723 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9724 static int |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9725 xbm_scan (s, end, sval, ival) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9726 char **s, *end; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9727 char *sval; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9728 int *ival; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9729 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9730 int c; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9731 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9732 loop: |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9733 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9734 /* Skip white space. */ |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9735 while (*s < end && (c = *(*s)++, isspace (c))) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9736 ; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9737 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9738 if (*s >= end) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9739 c = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9740 else if (isdigit (c)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9741 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9742 int value = 0, digit; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9743 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9744 if (c == '0' && *s < end) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9745 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9746 c = *(*s)++; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9747 if (c == 'x' || c == 'X') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9748 { |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9749 while (*s < end) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9750 { |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9751 c = *(*s)++; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9752 if (isdigit (c)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9753 digit = c - '0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9754 else if (c >= 'a' && c <= 'f') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9755 digit = c - 'a' + 10; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9756 else if (c >= 'A' && c <= 'F') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9757 digit = c - 'A' + 10; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9758 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9759 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9760 value = 16 * value + digit; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9761 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9762 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9763 else if (isdigit (c)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9764 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9765 value = c - '0'; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9766 while (*s < end |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9767 && (c = *(*s)++, isdigit (c))) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9768 value = 8 * value + c - '0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9769 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9770 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9771 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9772 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9773 value = c - '0'; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9774 while (*s < end |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9775 && (c = *(*s)++, isdigit (c))) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9776 value = 10 * value + c - '0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9777 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9778 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9779 if (*s < end) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9780 *s = *s - 1; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9781 *ival = value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9782 c = XBM_TK_NUMBER; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9783 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9784 else if (isalpha (c) || c == '_') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9785 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9786 *sval++ = c; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9787 while (*s < end |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9788 && (c = *(*s)++, (isalnum (c) || c == '_'))) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9789 *sval++ = c; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9790 *sval = 0; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9791 if (*s < end) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9792 *s = *s - 1; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9793 c = XBM_TK_IDENT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9794 } |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9795 else if (c == '/' && **s == '*') |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9796 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9797 /* C-style comment. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9798 ++*s; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9799 while (**s && (**s != '*' || *(*s + 1) != '/')) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9800 ++*s; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9801 if (**s) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9802 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9803 *s += 2; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9804 goto loop; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9805 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9806 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9807 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9808 return c; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9809 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9810 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9811 |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9812 /* XBM bits seem to be backward within bytes compared with how |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9813 Windows does things. */ |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9814 static unsigned char reflect_byte (unsigned char orig) |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9815 { |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9816 int i; |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9817 unsigned char reflected = 0x00; |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9818 for (i = 0; i < 8; i++) |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9819 { |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9820 if (orig & (0x01 << i)) |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9821 reflected |= 0x80 >> i; |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9822 } |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9823 return reflected; |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9824 } |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9825 |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9826 |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9827 /* Create a Windows bitmap from X bitmap data. */ |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9828 static HBITMAP |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9829 w32_create_pixmap_from_bitmap_data (int width, int height, char *data) |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9830 { |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9831 int i, j, w1, w2; |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9832 char *bits, *p; |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9833 HBITMAP bmp; |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9834 |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9835 w1 = (width + 7) / 8; /* nb of 8bits elt in X bitmap */ |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9836 w2 = ((width + 15) / 16) * 2; /* nb of 16bits elt in W32 bitmap */ |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9837 bits = (char *) xmalloc (height * w2); |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9838 bzero (bits, height * w2); |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9839 for (i = 0; i < height; i++) |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9840 { |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9841 p = bits + i*w2; |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9842 for (j = 0; j < w1; j++) |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9843 *p++ = reflect_byte(*data++); |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9844 } |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9845 bmp = CreateBitmap (width, height, 1, 1, bits); |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9846 xfree (bits); |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9847 |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9848 return bmp; |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9849 } |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9850 |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9851 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9852 /* Replacement for XReadBitmapFileData which isn't available under old |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9853 X versions. CONTENTS is a pointer to a buffer to parse; END is the |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9854 buffer's end. Set *WIDTH and *HEIGHT to the width and height of |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9855 the image. Return in *DATA the bitmap data allocated with xmalloc. |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9856 Value is non-zero if successful. DATA null means just test if |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9857 CONTENTS looks like an in-memory XBM file. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9858 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9859 static int |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9860 xbm_read_bitmap_data (contents, end, width, height, data) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9861 char *contents, *end; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9862 int *width, *height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9863 unsigned char **data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9864 { |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9865 char *s = contents; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9866 char buffer[BUFSIZ]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9867 int padding_p = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9868 int v10 = 0; |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9869 int bytes_per_line, i, nbytes; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9870 unsigned char *p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9871 int value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9872 int LA1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9873 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9874 #define match() \ |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9875 LA1 = xbm_scan (&s, end, buffer, &value) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9876 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9877 #define expect(TOKEN) \ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9878 if (LA1 != (TOKEN)) \ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9879 goto failure; \ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9880 else \ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9881 match () |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9882 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9883 #define expect_ident(IDENT) \ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9884 if (LA1 == XBM_TK_IDENT && strcmp (buffer, (IDENT)) == 0) \ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9885 match (); \ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9886 else \ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9887 goto failure |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9888 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9889 *width = *height = -1; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9890 if (data) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9891 *data = NULL; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9892 LA1 = xbm_scan (&s, end, buffer, &value); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9893 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9894 /* Parse defines for width, height and hot-spots. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9895 while (LA1 == '#') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9896 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9897 match (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9898 expect_ident ("define"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9899 expect (XBM_TK_IDENT); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9900 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9901 if (LA1 == XBM_TK_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9902 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9903 char *p = strrchr (buffer, '_'); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9904 p = p ? p + 1 : buffer; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9905 if (strcmp (p, "width") == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9906 *width = value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9907 else if (strcmp (p, "height") == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9908 *height = value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9909 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9910 expect (XBM_TK_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9911 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9912 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9913 if (*width < 0 || *height < 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9914 goto failure; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9915 else if (data == NULL) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9916 goto success; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9917 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9918 /* Parse bits. Must start with `static'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9919 expect_ident ("static"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9920 if (LA1 == XBM_TK_IDENT) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9921 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9922 if (strcmp (buffer, "unsigned") == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9923 { |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9924 match (); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9925 expect_ident ("char"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9926 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9927 else if (strcmp (buffer, "short") == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9928 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9929 match (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9930 v10 = 1; |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9931 if (*width % 16 && *width % 16 < 9) |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9932 padding_p = 1; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9933 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9934 else if (strcmp (buffer, "char") == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9935 match (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9936 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9937 goto failure; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9938 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9939 else |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9940 goto failure; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9941 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9942 expect (XBM_TK_IDENT); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9943 expect ('['); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9944 expect (']'); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9945 expect ('='); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9946 expect ('{'); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9947 |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9948 bytes_per_line = (*width + 7) / 8 + padding_p; |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9949 nbytes = bytes_per_line * *height; |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9950 p = *data = (char *) xmalloc (nbytes); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9951 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9952 if (v10) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9953 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9954 for (i = 0; i < nbytes; i += 2) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9955 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9956 int val = value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9957 expect (XBM_TK_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9958 |
48351
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
9959 *p++ = ~ val; |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9960 if (!padding_p || ((i + 2) % bytes_per_line)) |
48351
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
9961 *p++ = ~ (value >> 8); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9962 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9963 if (LA1 == ',' || LA1 == '}') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9964 match (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9965 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9966 goto failure; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9967 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9968 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9969 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9970 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9971 for (i = 0; i < nbytes; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9972 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9973 int val = value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9974 expect (XBM_TK_NUMBER); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9975 |
48351
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
9976 *p++ = ~ val; |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
9977 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9978 if (LA1 == ',' || LA1 == '}') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9979 match (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9980 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9981 goto failure; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9982 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9983 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9984 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9985 success: |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9986 return 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9987 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9988 failure: |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9989 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9990 if (data && *data) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9991 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9992 xfree (*data); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9993 *data = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9994 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9995 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9996 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9997 #undef match |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9998 #undef expect |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9999 #undef expect_ident |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10000 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10001 |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10002 static void convert_mono_to_color_image (f, img, foreground, background) |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10003 struct frame *f; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10004 struct image *img; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10005 COLORREF foreground, background; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10006 { |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10007 HDC hdc, old_img_dc, new_img_dc; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10008 HGDIOBJ old_prev, new_prev; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10009 HBITMAP new_pixmap; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10010 |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10011 hdc = get_frame_dc (f); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10012 old_img_dc = CreateCompatibleDC (hdc); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10013 new_img_dc = CreateCompatibleDC (hdc); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10014 new_pixmap = CreateCompatibleBitmap (hdc, img->width, img->height); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10015 release_frame_dc (f, hdc); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10016 old_prev = SelectObject (old_img_dc, img->pixmap); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10017 new_prev = SelectObject (new_img_dc, new_pixmap); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10018 SetTextColor (new_img_dc, foreground); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10019 SetBkColor (new_img_dc, background); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10020 |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10021 BitBlt (new_img_dc, 0, 0, img->width, img->height, old_img_dc, |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10022 0, 0, SRCCOPY); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10023 |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10024 SelectObject (old_img_dc, old_prev); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10025 SelectObject (new_img_dc, new_prev); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10026 DeleteDC (old_img_dc); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10027 DeleteDC (new_img_dc); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10028 DeleteObject (img->pixmap); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10029 if (new_pixmap == 0) |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10030 fprintf (stderr, "Failed to convert image to color.\n"); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10031 else |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10032 img->pixmap = new_pixmap; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10033 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10034 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10035 /* Load XBM image IMG which will be displayed on frame F from buffer |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10036 CONTENTS. END is the end of the buffer. Value is non-zero if |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10037 successful. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10038 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10039 static int |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10040 xbm_load_image (f, img, contents, end) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10041 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10042 struct image *img; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10043 char *contents, *end; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10044 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10045 int rc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10046 unsigned char *data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10047 int success_p = 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10048 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10049 rc = xbm_read_bitmap_data (contents, end, &img->width, &img->height, &data); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10050 if (rc) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10051 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10052 unsigned long foreground = FRAME_FOREGROUND_PIXEL (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10053 unsigned long background = FRAME_BACKGROUND_PIXEL (f); |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10054 int non_default_colors = 0; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10055 Lisp_Object value; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10056 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10057 xassert (img->width > 0 && img->height > 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10058 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10059 /* Get foreground and background colors, maybe allocate colors. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10060 value = image_spec_value (img->spec, QCforeground, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10061 if (!NILP (value)) |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10062 { |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10063 foreground = x_alloc_image_color (f, img, value, foreground); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10064 non_default_colors = 1; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10065 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10066 value = image_spec_value (img->spec, QCbackground, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10067 if (!NILP (value)) |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10068 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10069 background = x_alloc_image_color (f, img, value, background); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10070 img->background = background; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10071 img->background_valid = 1; |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10072 non_default_colors = 1; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10073 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10074 img->pixmap |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
10075 = w32_create_pixmap_from_bitmap_data (img->width, img->height, data); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10076 |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10077 /* If colors were specified, transfer the bitmap to a color one. */ |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10078 if (non_default_colors) |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10079 convert_mono_to_color_image (f, img, foreground, background); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10080 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10081 xfree (data); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10082 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10083 if (img->pixmap == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10084 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10085 x_clear_image (f, img); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10086 image_error ("Unable to create X pixmap for `%s'", img->spec, Qnil); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10087 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10088 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10089 success_p = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10090 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10091 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10092 image_error ("Error loading XBM image `%s'", img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10093 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10094 return success_p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10095 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10096 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10097 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10098 /* Value is non-zero if DATA looks like an in-memory XBM file. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10099 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10100 static int |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10101 xbm_file_p (data) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10102 Lisp_Object data; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10103 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10104 int w, h; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10105 return (STRINGP (data) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10106 && 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:
46293
diff
changeset
|
10107 (SDATA (data) |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10108 + SBYTES (data)), |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10109 &w, &h, NULL)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10110 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10111 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10112 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10113 /* Fill image IMG which is used on frame F with pixmap data. Value is |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10114 non-zero if successful. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10115 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10116 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10117 xbm_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10118 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10119 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10120 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10121 int success_p = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10122 Lisp_Object file_name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10123 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10124 xassert (xbm_image_p (img->spec)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10125 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10126 /* If IMG->spec specifies a file name, create a non-file spec from it. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10127 file_name = image_spec_value (img->spec, QCfile, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10128 if (STRINGP (file_name)) |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10129 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10130 Lisp_Object file; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10131 char *contents; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10132 int size; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10133 struct gcpro gcpro1; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10134 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10135 file = x_find_image_file (file_name); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10136 GCPRO1 (file); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10137 if (!STRINGP (file)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10138 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10139 image_error ("Cannot find image file `%s'", file_name, Qnil); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10140 UNGCPRO; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10141 return 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10142 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10143 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10144 contents = slurp_file (SDATA (file), &size); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10145 if (contents == NULL) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10146 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10147 image_error ("Error loading XBM image `%s'", img->spec, Qnil); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10148 UNGCPRO; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10149 return 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10150 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10151 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10152 success_p = xbm_load_image (f, img, contents, contents + size); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10153 UNGCPRO; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10154 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10155 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10156 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10157 struct image_keyword fmt[XBM_LAST]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10158 Lisp_Object data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10159 unsigned long foreground = FRAME_FOREGROUND_PIXEL (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10160 unsigned long background = FRAME_BACKGROUND_PIXEL (f); |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10161 int non_default_colors = 0; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10162 char *bits; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10163 int parsed_p; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10164 int in_memory_file_p = 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10165 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10166 /* See if data looks like an in-memory XBM file. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10167 data = image_spec_value (img->spec, QCdata, NULL); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10168 in_memory_file_p = xbm_file_p (data); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10169 |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
10170 /* Parse the image specification. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10171 bcopy (xbm_format, fmt, sizeof fmt); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10172 parsed_p = parse_image_spec (img->spec, fmt, XBM_LAST, Qxbm); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10173 xassert (parsed_p); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10174 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10175 /* Get specified width, and height. */ |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10176 if (!in_memory_file_p) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10177 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10178 img->width = XFASTINT (fmt[XBM_WIDTH].value); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10179 img->height = XFASTINT (fmt[XBM_HEIGHT].value); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10180 xassert (img->width > 0 && img->height > 0); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10181 } |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
10182 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10183 /* Get foreground and background colors, maybe allocate colors. */ |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10184 if (fmt[XBM_FOREGROUND].count |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10185 && STRINGP (fmt[XBM_FOREGROUND].value)) |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10186 { |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10187 foreground = x_alloc_image_color (f, img, fmt[XBM_FOREGROUND].value, |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10188 foreground); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10189 non_default_colors = 1; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10190 } |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10191 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10192 if (fmt[XBM_BACKGROUND].count |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10193 && STRINGP (fmt[XBM_BACKGROUND].value)) |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10194 { |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10195 background = x_alloc_image_color (f, img, fmt[XBM_BACKGROUND].value, |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10196 background); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10197 non_default_colors = 1; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10198 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10199 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10200 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:
46293
diff
changeset
|
10201 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:
46293
diff
changeset
|
10202 (SDATA (data) |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10203 + SBYTES (data))); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10204 else |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10205 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10206 if (VECTORP (data)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10207 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10208 int i; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10209 char *p; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10210 int nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10211 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10212 p = bits = (char *) alloca (nbytes * img->height); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10213 for (i = 0; i < img->height; ++i, p += nbytes) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10214 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10215 Lisp_Object line = XVECTOR (data)->contents[i]; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10216 if (STRINGP (line)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10217 bcopy (SDATA (line), p, nbytes); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10218 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10219 bcopy (XBOOL_VECTOR (line)->data, p, nbytes); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10220 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10221 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10222 else if (STRINGP (data)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10223 bits = SDATA (data); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10224 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10225 bits = XBOOL_VECTOR (data)->data; |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
10226 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10227 /* Create the pixmap. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10228 img->pixmap |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
10229 = w32_create_pixmap_from_bitmap_data (img->width, img->height, |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
10230 bits); |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
10231 |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10232 /* If colors were specified, transfer the bitmap to a color one. */ |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10233 if (non_default_colors) |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10234 convert_mono_to_color_image (f, img, foreground, background); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
10235 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10236 if (img->pixmap) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10237 success_p = 1; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10238 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10239 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10240 image_error ("Unable to create pixmap for XBM image `%s'", |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10241 img->spec, Qnil); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10242 x_clear_image (f, img); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10243 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10244 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10245 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10246 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10247 return success_p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10248 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10249 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10250 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10251 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10252 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10253 XPM images |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10254 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10255 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10256 #if HAVE_XPM |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10257 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10258 static int xpm_image_p P_ ((Lisp_Object object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10259 static int xpm_load P_ ((struct frame *f, struct image *img)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10260 static int xpm_valid_color_symbols_p P_ ((Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10261 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10262 #include "X11/xpm.h" |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10263 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10264 /* The symbol `xpm' identifying XPM-format images. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10265 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10266 Lisp_Object Qxpm; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10267 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10268 /* Indices of image specification fields in xpm_format, below. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10269 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10270 enum xpm_keyword_index |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10271 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10272 XPM_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10273 XPM_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10274 XPM_DATA, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10275 XPM_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10276 XPM_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10277 XPM_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10278 XPM_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10279 XPM_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10280 XPM_MASK, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10281 XPM_COLOR_SYMBOLS, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10282 XPM_BACKGROUND, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10283 XPM_LAST |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10284 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10285 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10286 /* Vector of image_keyword structures describing the format |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10287 of valid XPM image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10288 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10289 static struct image_keyword xpm_format[XPM_LAST] = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10290 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10291 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10292 {":file", IMAGE_STRING_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10293 {":data", IMAGE_STRING_VALUE, 0}, |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
10294 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
10295 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10296 {":relief", IMAGE_INTEGER_VALUE, 0}, |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
10297 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10298 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10299 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10300 {":color-symbols", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10301 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10302 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10303 |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10304 /* Structure describing the image type XPM. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10305 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10306 static struct image_type xpm_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10307 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10308 &Qxpm, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10309 xpm_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10310 xpm_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10311 x_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10312 NULL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10313 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10314 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10315 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10316 /* Value is non-zero if COLOR_SYMBOLS is a valid color symbols list |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10317 for XPM images. Such a list must consist of conses whose car and |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10318 cdr are strings. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10319 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10320 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10321 xpm_valid_color_symbols_p (color_symbols) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10322 Lisp_Object color_symbols; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10323 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10324 while (CONSP (color_symbols)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10325 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10326 Lisp_Object sym = XCAR (color_symbols); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10327 if (!CONSP (sym) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10328 || !STRINGP (XCAR (sym)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10329 || !STRINGP (XCDR (sym))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10330 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10331 color_symbols = XCDR (color_symbols); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10332 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10333 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10334 return NILP (color_symbols); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10335 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10336 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10337 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10338 /* Value is non-zero if OBJECT is a valid XPM image specification. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10339 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10340 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10341 xpm_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10342 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10343 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10344 struct image_keyword fmt[XPM_LAST]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10345 bcopy (xpm_format, fmt, sizeof fmt); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10346 return (parse_image_spec (object, fmt, XPM_LAST, Qxpm) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10347 /* Either `:file' or `:data' must be present. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10348 && fmt[XPM_FILE].count + fmt[XPM_DATA].count == 1 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10349 /* Either no `:color-symbols' or it's a list of conses |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10350 whose car and cdr are strings. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10351 && (fmt[XPM_COLOR_SYMBOLS].count == 0 |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
10352 || xpm_valid_color_symbols_p (fmt[XPM_COLOR_SYMBOLS].value))); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10353 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10354 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10355 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10356 /* Load image IMG which will be displayed on frame F. Value is |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10357 non-zero if successful. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10358 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10359 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10360 xpm_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10361 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10362 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10363 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10364 int rc, i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10365 XpmAttributes attrs; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10366 Lisp_Object specified_file, color_symbols; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10367 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10368 /* Configure the XPM lib. Use the visual of frame F. Allocate |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10369 close colors. Return colors allocated. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10370 bzero (&attrs, sizeof attrs); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
10371 attrs.visual = FRAME_X_VISUAL (f); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
10372 attrs.colormap = FRAME_X_COLORMAP (f); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10373 attrs.valuemask |= XpmVisual; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
10374 attrs.valuemask |= XpmColormap; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10375 attrs.valuemask |= XpmReturnAllocPixels; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
10376 #ifdef XpmAllocCloseColors |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10377 attrs.alloc_close_colors = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10378 attrs.valuemask |= XpmAllocCloseColors; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
10379 #else |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
10380 attrs.closeness = 600; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
10381 attrs.valuemask |= XpmCloseness; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
10382 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10383 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10384 /* If image specification contains symbolic color definitions, add |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10385 these to `attrs'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10386 color_symbols = image_spec_value (img->spec, QCcolor_symbols, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10387 if (CONSP (color_symbols)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10388 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10389 Lisp_Object tail; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10390 XpmColorSymbol *xpm_syms; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10391 int i, size; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10392 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10393 attrs.valuemask |= XpmColorSymbols; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10394 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10395 /* Count number of symbols. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10396 attrs.numsymbols = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10397 for (tail = color_symbols; CONSP (tail); tail = XCDR (tail)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10398 ++attrs.numsymbols; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10399 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10400 /* Allocate an XpmColorSymbol array. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10401 size = attrs.numsymbols * sizeof *xpm_syms; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10402 xpm_syms = (XpmColorSymbol *) alloca (size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10403 bzero (xpm_syms, size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10404 attrs.colorsymbols = xpm_syms; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10405 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10406 /* Fill the color symbol array. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10407 for (tail = color_symbols, i = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10408 CONSP (tail); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10409 ++i, tail = XCDR (tail)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10410 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10411 Lisp_Object name = XCAR (XCAR (tail)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10412 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:
46293
diff
changeset
|
10413 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:
46293
diff
changeset
|
10414 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:
46293
diff
changeset
|
10415 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:
46293
diff
changeset
|
10416 strcpy (xpm_syms[i].value, SDATA (color)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10417 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10418 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10419 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10420 /* Create a pixmap for the image, either from a file, or from a |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10421 string buffer containing data in the same format as an XPM file. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10422 BLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10423 specified_file = image_spec_value (img->spec, QCfile, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10424 if (STRINGP (specified_file)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10425 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10426 Lisp_Object file = x_find_image_file (specified_file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10427 if (!STRINGP (file)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10428 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10429 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10430 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10431 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10432 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10433 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10434 rc = XpmReadFileToPixmap (NULL, FRAME_W32_WINDOW (f), |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10435 SDATA (file), &img->pixmap, &img->mask, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10436 &attrs); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10437 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10438 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10439 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10440 Lisp_Object buffer = image_spec_value (img->spec, QCdata, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10441 rc = XpmCreatePixmapFromBuffer (NULL, FRAME_W32_WINDOW (f), |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10442 SDATA (buffer), |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10443 &img->pixmap, &img->mask, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10444 &attrs); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10445 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10446 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10447 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10448 if (rc == XpmSuccess) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10449 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10450 /* Remember allocated colors. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10451 img->ncolors = attrs.nalloc_pixels; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10452 img->colors = (unsigned long *) xmalloc (img->ncolors |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10453 * sizeof *img->colors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10454 for (i = 0; i < attrs.nalloc_pixels; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10455 img->colors[i] = attrs.alloc_pixels[i]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10456 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10457 img->width = attrs.width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10458 img->height = attrs.height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10459 xassert (img->width > 0 && img->height > 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10460 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10461 /* The call to XpmFreeAttributes below frees attrs.alloc_pixels. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10462 BLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10463 XpmFreeAttributes (&attrs); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10464 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10465 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10466 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10467 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10468 switch (rc) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10469 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10470 case XpmOpenFailed: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10471 image_error ("Error opening XPM file (%s)", img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10472 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10473 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10474 case XpmFileInvalid: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10475 image_error ("Invalid XPM file (%s)", img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10476 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10477 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10478 case XpmNoMemory: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10479 image_error ("Out of memory (%s)", img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10480 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10481 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10482 case XpmColorFailed: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10483 image_error ("Color allocation error (%s)", img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10484 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10485 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10486 default: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10487 image_error ("Unknown error (%s)", img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10488 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10489 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10490 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10491 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10492 return rc == XpmSuccess; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10493 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10494 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10495 #endif /* HAVE_XPM != 0 */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10496 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10497 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
10498 #if 0 /* TODO : Color tables on W32. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10499 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10500 Color table |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10501 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10502 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10503 /* An entry in the color table mapping an RGB color to a pixel color. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10504 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10505 struct ct_color |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10506 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10507 int r, g, b; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10508 unsigned long pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10509 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10510 /* Next in color table collision list. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10511 struct ct_color *next; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10512 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10513 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10514 /* The bucket vector size to use. Must be prime. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10515 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10516 #define CT_SIZE 101 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10517 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10518 /* Value is a hash of the RGB color given by R, G, and B. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10519 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10520 #define CT_HASH_RGB(R, G, B) (((R) << 16) ^ ((G) << 8) ^ (B)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10521 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10522 /* The color hash table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10523 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10524 struct ct_color **ct_table; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10525 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10526 /* Number of entries in the color table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10527 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10528 int ct_colors_allocated; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10529 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10530 /* Function prototypes. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10531 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10532 static void init_color_table P_ ((void)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10533 static void free_color_table P_ ((void)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10534 static unsigned long *colors_in_color_table P_ ((int *n)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10535 static unsigned long lookup_rgb_color P_ ((struct frame *f, int r, int g, int b)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10536 static unsigned long lookup_pixel_color P_ ((struct frame *f, unsigned long p)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10537 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10538 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10539 /* Initialize the color table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10540 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10541 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10542 init_color_table () |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10543 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10544 int size = CT_SIZE * sizeof (*ct_table); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10545 ct_table = (struct ct_color **) xmalloc (size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10546 bzero (ct_table, size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10547 ct_colors_allocated = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10548 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10549 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10550 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10551 /* Free memory associated with the color table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10552 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10553 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10554 free_color_table () |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10555 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10556 int i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10557 struct ct_color *p, *next; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10558 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10559 for (i = 0; i < CT_SIZE; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10560 for (p = ct_table[i]; p; p = next) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10561 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10562 next = p->next; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10563 xfree (p); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10564 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10565 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10566 xfree (ct_table); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10567 ct_table = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10568 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10569 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10570 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10571 /* Value is a pixel color for RGB color R, G, B on frame F. If an |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10572 entry for that color already is in the color table, return the |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10573 pixel color of that entry. Otherwise, allocate a new color for R, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10574 G, B, and make an entry in the color table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10575 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10576 static unsigned long |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10577 lookup_rgb_color (f, r, g, b) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10578 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10579 int r, g, b; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10580 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10581 unsigned hash = CT_HASH_RGB (r, g, b); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10582 int i = hash % CT_SIZE; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10583 struct ct_color *p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10584 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10585 for (p = ct_table[i]; p; p = p->next) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10586 if (p->r == r && p->g == g && p->b == b) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10587 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10588 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10589 if (p == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10590 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10591 COLORREF color; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10592 Colormap cmap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10593 int rc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10594 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10595 color = PALETTERGB (r, g, b); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10596 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10597 ++ct_colors_allocated; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10598 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10599 p = (struct ct_color *) xmalloc (sizeof *p); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10600 p->r = r; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10601 p->g = g; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10602 p->b = b; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10603 p->pixel = color; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10604 p->next = ct_table[i]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10605 ct_table[i] = p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10606 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10607 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10608 return p->pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10609 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10610 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10611 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10612 /* Look up pixel color PIXEL which is used on frame F in the color |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10613 table. If not already present, allocate it. Value is PIXEL. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10614 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10615 static unsigned long |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10616 lookup_pixel_color (f, pixel) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10617 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10618 unsigned long pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10619 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10620 int i = pixel % CT_SIZE; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10621 struct ct_color *p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10622 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10623 for (p = ct_table[i]; p; p = p->next) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10624 if (p->pixel == pixel) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10625 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10626 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10627 if (p == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10628 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10629 XColor color; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10630 Colormap cmap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10631 int rc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10632 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10633 BLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10634 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10635 cmap = DefaultColormapOfScreen (FRAME_X_SCREEN (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10636 color.pixel = pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10637 XQueryColor (NULL, cmap, &color); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10638 rc = x_alloc_nearest_color (f, cmap, &color); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10639 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10640 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10641 if (rc) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10642 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10643 ++ct_colors_allocated; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10644 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10645 p = (struct ct_color *) xmalloc (sizeof *p); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10646 p->r = color.red; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10647 p->g = color.green; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10648 p->b = color.blue; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10649 p->pixel = pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10650 p->next = ct_table[i]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10651 ct_table[i] = p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10652 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10653 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10654 return FRAME_FOREGROUND_PIXEL (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10655 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10656 return p->pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10657 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10658 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10659 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10660 /* Value is a vector of all pixel colors contained in the color table, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10661 allocated via xmalloc. Set *N to the number of colors. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10662 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10663 static unsigned long * |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10664 colors_in_color_table (n) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10665 int *n; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10666 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10667 int i, j; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10668 struct ct_color *p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10669 unsigned long *colors; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10670 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10671 if (ct_colors_allocated == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10672 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10673 *n = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10674 colors = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10675 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10676 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10677 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10678 colors = (unsigned long *) xmalloc (ct_colors_allocated |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10679 * sizeof *colors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10680 *n = ct_colors_allocated; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10681 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10682 for (i = j = 0; i < CT_SIZE; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10683 for (p = ct_table[i]; p; p = p->next) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10684 colors[j++] = p->pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10685 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10686 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10687 return colors; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10688 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10689 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
10690 #endif /* TODO */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10691 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10692 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10693 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10694 Algorithms |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10695 ***********************************************************************/ |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10696 static XColor *x_to_xcolors P_ ((struct frame *, struct image *, int)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10697 static void x_from_xcolors P_ ((struct frame *, struct image *, XColor *)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10698 static void x_detect_edges P_ ((struct frame *, struct image *, int[9], int)); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10699 static void XPutPixel (XImage *, int, int, COLORREF); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10700 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10701 /* Non-zero means draw a cross on images having `:conversion |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10702 disabled'. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10703 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10704 int cross_disabled_images; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10705 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10706 /* Edge detection matrices for different edge-detection |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10707 strategies. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10708 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10709 static int emboss_matrix[9] = { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10710 /* x - 1 x x + 1 */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10711 2, -1, 0, /* y - 1 */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10712 -1, 0, 1, /* y */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10713 0, 1, -2 /* y + 1 */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10714 }; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10715 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10716 static int laplace_matrix[9] = { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10717 /* x - 1 x x + 1 */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10718 1, 0, 0, /* y - 1 */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10719 0, 0, 0, /* y */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10720 0, 0, -1 /* y + 1 */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10721 }; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10722 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10723 /* Value is the intensity of the color whose red/green/blue values |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10724 are R, G, and B. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10725 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10726 #define COLOR_INTENSITY(R, G, B) ((2 * (R) + 3 * (G) + (B)) / 6) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10727 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10728 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10729 /* On frame F, return an array of XColor structures describing image |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10730 IMG->pixmap. Each XColor structure has its pixel color set. RGB_P |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10731 non-zero means also fill the red/green/blue members of the XColor |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10732 structures. Value is a pointer to the array of XColors structures, |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10733 allocated with xmalloc; it must be freed by the caller. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10734 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10735 static XColor * |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10736 x_to_xcolors (f, img, rgb_p) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10737 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10738 struct image *img; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10739 int rgb_p; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10740 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10741 int x, y; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10742 XColor *colors, *p; |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10743 HDC hdc, bmpdc; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10744 HGDIOBJ prev; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10745 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10746 colors = (XColor *) xmalloc (img->width * img->height * sizeof *colors); |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10747 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10748 /* Load the image into a memory device context. */ |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10749 hdc = get_frame_dc (f); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10750 bmpdc = CreateCompatibleDC (hdc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10751 release_frame_dc (f, hdc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10752 prev = SelectObject (bmpdc, img->pixmap); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10753 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10754 /* Fill the `pixel' members of the XColor array. I wished there |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10755 were an easy and portable way to circumvent XGetPixel. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10756 p = colors; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10757 for (y = 0; y < img->height; ++y) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10758 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10759 XColor *row = p; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10760 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10761 for (x = 0; x < img->width; ++x, ++p) |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10762 { |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10763 /* TODO: palette support needed here? */ |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10764 p->pixel = GetPixel (bmpdc, x, y); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10765 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10766 if (rgb_p) |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10767 { |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10768 p->red = 256 * GetRValue (p->pixel); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10769 p->green = 256 * GetGValue (p->pixel); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10770 p->blue = 256 * GetBValue (p->pixel); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10771 } |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10772 } |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10773 } |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10774 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10775 SelectObject (bmpdc, prev); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10776 DeleteDC (bmpdc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10777 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10778 return colors; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10779 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10780 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10781 /* Put a pixel of COLOR at position X, Y in XIMG. XIMG must have been |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10782 created with CreateDIBSection, with the pointer to the bit values |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10783 stored in ximg->data. */ |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10784 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10785 static void XPutPixel (ximg, x, y, color) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10786 XImage * ximg; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10787 int x, y; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10788 COLORREF color; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10789 { |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10790 int width = ximg->info.bmiHeader.biWidth; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10791 int height = ximg->info.bmiHeader.biHeight; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10792 int rowbytes = width * 3; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10793 unsigned char * pixel; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10794 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10795 /* Don't support putting pixels in images with palettes. */ |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10796 xassert (ximg->info.bmiHeader.biBitCount == 24); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10797 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10798 /* Ensure scanlines are aligned on 4 byte boundaries. */ |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10799 if (rowbytes % 4) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10800 rowbytes += 4 - (rowbytes % 4); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10801 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10802 pixel = ximg->data + y * rowbytes + x * 3; |
48448
2d334bd224b4
(x_build_heuristic_mask): Filter palette info from color.
Jason Rumney <jasonr@gnu.org>
parents:
48444
diff
changeset
|
10803 /* Windows bitmaps are in BGR order. */ |
2d334bd224b4
(x_build_heuristic_mask): Filter palette info from color.
Jason Rumney <jasonr@gnu.org>
parents:
48444
diff
changeset
|
10804 *pixel = GetBValue (color); |
48351
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
10805 *(pixel + 1) = GetGValue (color); |
48448
2d334bd224b4
(x_build_heuristic_mask): Filter palette info from color.
Jason Rumney <jasonr@gnu.org>
parents:
48444
diff
changeset
|
10806 *(pixel + 2) = GetRValue (color); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10807 } |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10808 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10809 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10810 /* Create IMG->pixmap from an array COLORS of XColor structures, whose |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10811 RGB members are set. F is the frame on which this all happens. |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10812 COLORS will be freed; an existing IMG->pixmap will be freed, too. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10813 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10814 static void |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10815 x_from_xcolors (f, img, colors) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10816 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10817 struct image *img; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10818 XColor *colors; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10819 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10820 int x, y; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10821 XImage *oimg; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10822 Pixmap pixmap; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10823 XColor *p; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10824 #if 0 /* TODO: color tables. */ |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10825 init_color_table (); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10826 #endif |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10827 x_create_x_image_and_pixmap (f, img->width, img->height, 0, |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10828 &oimg, &pixmap); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10829 p = colors; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10830 for (y = 0; y < img->height; ++y) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10831 for (x = 0; x < img->width; ++x, ++p) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10832 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10833 unsigned long pixel; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10834 #if 0 /* TODO: color tables. */ |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10835 pixel = lookup_rgb_color (f, p->red, p->green, p->blue); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10836 #else |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10837 pixel = PALETTERGB (p->red / 256, p->green / 256, p->blue / 256); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10838 #endif |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10839 XPutPixel (oimg, x, y, pixel); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10840 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10841 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10842 xfree (colors); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10843 x_clear_image_1 (f, img, 1, 0, 1); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10844 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10845 x_put_x_image (f, oimg, pixmap, img->width, img->height); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10846 x_destroy_x_image (oimg); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10847 img->pixmap = pixmap; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10848 #if 0 /* TODO: color tables. */ |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10849 img->colors = colors_in_color_table (&img->ncolors); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10850 free_color_table (); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10851 #endif |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10852 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10853 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10854 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10855 /* On frame F, perform edge-detection on image IMG. |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10856 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10857 MATRIX is a nine-element array specifying the transformation |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10858 matrix. See emboss_matrix for an example. |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10859 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10860 COLOR_ADJUST is a color adjustment added to each pixel of the |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10861 outgoing image. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10862 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10863 static void |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10864 x_detect_edges (f, img, matrix, color_adjust) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10865 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10866 struct image *img; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10867 int matrix[9], color_adjust; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10868 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10869 XColor *colors = x_to_xcolors (f, img, 1); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10870 XColor *new, *p; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10871 int x, y, i, sum; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10872 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10873 for (i = sum = 0; i < 9; ++i) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10874 sum += abs (matrix[i]); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10875 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10876 #define COLOR(A, X, Y) ((A) + (Y) * img->width + (X)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10877 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10878 new = (XColor *) xmalloc (img->width * img->height * sizeof *new); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10879 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10880 for (y = 0; y < img->height; ++y) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10881 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10882 p = COLOR (new, 0, y); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10883 p->red = p->green = p->blue = 0xffff/2; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10884 p = COLOR (new, img->width - 1, y); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10885 p->red = p->green = p->blue = 0xffff/2; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10886 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10887 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10888 for (x = 1; x < img->width - 1; ++x) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10889 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10890 p = COLOR (new, x, 0); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10891 p->red = p->green = p->blue = 0xffff/2; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10892 p = COLOR (new, x, img->height - 1); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10893 p->red = p->green = p->blue = 0xffff/2; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10894 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10895 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10896 for (y = 1; y < img->height - 1; ++y) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10897 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10898 p = COLOR (new, 1, y); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10899 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10900 for (x = 1; x < img->width - 1; ++x, ++p) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10901 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10902 int r, g, b, y1, x1; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10903 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10904 r = g = b = i = 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10905 for (y1 = y - 1; y1 < y + 2; ++y1) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10906 for (x1 = x - 1; x1 < x + 2; ++x1, ++i) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10907 if (matrix[i]) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10908 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10909 XColor *t = COLOR (colors, x1, y1); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10910 r += matrix[i] * t->red; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10911 g += matrix[i] * t->green; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10912 b += matrix[i] * t->blue; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10913 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10914 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10915 r = (r / sum + color_adjust) & 0xffff; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10916 g = (g / sum + color_adjust) & 0xffff; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10917 b = (b / sum + color_adjust) & 0xffff; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10918 p->red = p->green = p->blue = COLOR_INTENSITY (r, g, b); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10919 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10920 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10921 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10922 xfree (colors); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10923 x_from_xcolors (f, img, new); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10924 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10925 #undef COLOR |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10926 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10927 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10928 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10929 /* Perform the pre-defined `emboss' edge-detection on image IMG |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10930 on frame F. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10931 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10932 static void |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10933 x_emboss (f, img) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10934 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10935 struct image *img; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10936 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10937 x_detect_edges (f, img, emboss_matrix, 0xffff / 2); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10938 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10939 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10940 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10941 /* Transform image IMG which is used on frame F with a Laplace |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10942 edge-detection algorithm. The result is an image that can be used |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10943 to draw disabled buttons, for example. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10944 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10945 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10946 x_laplace (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10947 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10948 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10949 { |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10950 x_detect_edges (f, img, laplace_matrix, 45000); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10951 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10952 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10953 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10954 /* Perform edge-detection on image IMG on frame F, with specified |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10955 transformation matrix MATRIX and color-adjustment COLOR_ADJUST. |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10956 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10957 MATRIX must be either |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10958 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10959 - a list of at least 9 numbers in row-major form |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10960 - a vector of at least 9 numbers |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10961 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10962 COLOR_ADJUST nil means use a default; otherwise it must be a |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10963 number. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10964 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10965 static void |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10966 x_edge_detection (f, img, matrix, color_adjust) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10967 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10968 struct image *img; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10969 Lisp_Object matrix, color_adjust; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10970 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10971 int i = 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10972 int trans[9]; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10973 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10974 if (CONSP (matrix)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10975 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10976 for (i = 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10977 i < 9 && CONSP (matrix) && NUMBERP (XCAR (matrix)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10978 ++i, matrix = XCDR (matrix)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10979 trans[i] = XFLOATINT (XCAR (matrix)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10980 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10981 else if (VECTORP (matrix) && ASIZE (matrix) >= 9) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10982 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10983 for (i = 0; i < 9 && NUMBERP (AREF (matrix, i)); ++i) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10984 trans[i] = XFLOATINT (AREF (matrix, i)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10985 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10986 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10987 if (NILP (color_adjust)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10988 color_adjust = make_number (0xffff / 2); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10989 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10990 if (i == 9 && NUMBERP (color_adjust)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10991 x_detect_edges (f, img, trans, (int) XFLOATINT (color_adjust)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10992 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10993 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10994 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10995 /* Transform image IMG on frame F so that it looks disabled. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10996 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10997 static void |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10998 x_disable_image (f, img) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10999 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11000 struct image *img; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11001 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11002 struct w32_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11003 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11004 if (dpyinfo->n_planes * dpyinfo->n_cbits >= 2) |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11005 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11006 /* Color (or grayscale). Convert to gray, and equalize. Just |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11007 drawing such images with a stipple can look very odd, so |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11008 we're using this method instead. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11009 XColor *colors = x_to_xcolors (f, img, 1); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11010 XColor *p, *end; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11011 const int h = 15000; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11012 const int l = 30000; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11013 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11014 for (p = colors, end = colors + img->width * img->height; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11015 p < end; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11016 ++p) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11017 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11018 int i = COLOR_INTENSITY (p->red, p->green, p->blue); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11019 int i2 = (0xffff - h - l) * i / 0xffff + l; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11020 p->red = p->green = p->blue = i2; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11021 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11022 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11023 x_from_xcolors (f, img, colors); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11024 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11025 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11026 /* Draw a cross over the disabled image, if we must or if we |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11027 should. */ |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11028 if (dpyinfo->n_planes * dpyinfo->n_cbits < 2 || cross_disabled_images) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11029 { |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11030 HDC hdc, bmpdc; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11031 HGDIOBJ prev; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11032 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11033 hdc = get_frame_dc (f); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11034 bmpdc = CreateCompatibleDC (hdc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11035 release_frame_dc (f, hdc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11036 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11037 prev = SelectObject (bmpdc, img->pixmap); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11038 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11039 SetTextColor (bmpdc, BLACK_PIX_DEFAULT (f)); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11040 MoveToEx (bmpdc, 0, 0, NULL); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11041 LineTo (bmpdc, img->width - 1, img->height - 1); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11042 MoveToEx (bmpdc, 0, img->height - 1, NULL); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11043 LineTo (bmpdc, img->width - 1, 0); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11044 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11045 if (img->mask) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11046 { |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11047 SelectObject (bmpdc, img->mask); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11048 SetTextColor (bmpdc, WHITE_PIX_DEFAULT (f)); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11049 MoveToEx (bmpdc, 0, 0, NULL); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11050 LineTo (bmpdc, img->width - 1, img->height - 1); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11051 MoveToEx (bmpdc, 0, img->height - 1, NULL); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11052 LineTo (bmpdc, img->width - 1, 0); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11053 } |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11054 SelectObject (bmpdc, prev); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11055 DeleteDC (bmpdc); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11056 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11057 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11058 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11059 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11060 /* Build a mask for image IMG which is used on frame F. FILE is the |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11061 name of an image file, for error messages. HOW determines how to |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11062 determine the background color of IMG. If it is a list '(R G B)', |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11063 with R, G, and B being integers >= 0, take that as the color of the |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11064 background. Otherwise, determine the background color of IMG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11065 heuristically. Value is non-zero if successful. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11066 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11067 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11068 x_build_heuristic_mask (f, img, how) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11069 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11070 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11071 Lisp_Object how; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11072 { |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11073 HDC img_dc, frame_dc; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11074 HGDIOBJ prev; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11075 char *mask_img; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11076 int x, y, rc, use_img_background; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11077 unsigned long bg = 0; |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11078 int row_width; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11079 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11080 if (img->mask) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11081 { |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11082 DeleteObject (img->mask); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11083 img->mask = NULL; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11084 img->background_transparent_valid = 0; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11085 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11086 |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11087 /* Create the bit array serving as mask. */ |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11088 row_width = (img->width + 7) / 8; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11089 mask_img = xmalloc (row_width * img->height); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11090 bzero (mask_img, row_width * img->height); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11091 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11092 /* Create a memory device context for IMG->pixmap. */ |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11093 frame_dc = get_frame_dc (f); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11094 img_dc = CreateCompatibleDC (frame_dc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11095 release_frame_dc (f, frame_dc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11096 prev = SelectObject (img_dc, img->pixmap); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11097 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11098 /* Determine the background color of img_dc. If HOW is `(R G B)' |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11099 take that as color. Otherwise, use the image's background color. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11100 use_img_background = 1; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11101 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11102 if (CONSP (how)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11103 { |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11104 int rgb[3], i; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11105 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11106 for (i = 0; i < 3 && CONSP (how) && NATNUMP (XCAR (how)); ++i) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11107 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11108 rgb[i] = XFASTINT (XCAR (how)) & 0xffff; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11109 how = XCDR (how); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11110 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11111 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11112 if (i == 3 && NILP (how)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11113 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11114 char color_name[30]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11115 sprintf (color_name, "#%04x%04x%04x", rgb[0], rgb[1], rgb[2]); |
48444
7a9357cf0aa0
(x_build_heuristic_mask): Filter palette info from color.
Jason Rumney <jasonr@gnu.org>
parents:
48375
diff
changeset
|
11116 bg = x_alloc_image_color (f, img, build_string (color_name), 0) |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
11117 & 0x00ffffff; /* Filter out palette info. */ |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11118 use_img_background = 0; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11119 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11120 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11121 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11122 if (use_img_background) |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11123 bg = four_corners_best (img_dc, img->width, img->height); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11124 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11125 /* Set all bits in mask_img to 1 whose color in ximg is different |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11126 from the background color bg. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11127 for (y = 0; y < img->height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11128 for (x = 0; x < img->width; ++x) |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11129 { |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11130 COLORREF p = GetPixel (img_dc, x, y); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11131 if (p != bg) |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11132 mask_img[y * row_width + x / 8] |= 1 << (x % 8); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11133 } |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11134 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11135 /* Create the mask image. */ |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11136 img->mask = w32_create_pixmap_from_bitmap_data (img->width, img->height, |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11137 mask_img); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11138 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11139 /* Fill in the background_transparent field while we have the mask handy. */ |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11140 SelectObject (img_dc, img->mask); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11141 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11142 image_background_transparent (img, f, img_dc); |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11143 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11144 /* Put mask_img into img->mask. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11145 x_destroy_x_image (mask_img); |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11146 SelectObject (img_dc, prev); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
11147 DeleteDC (img_dc); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11148 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11149 return 1; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11150 } |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
11151 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11152 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11153 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11154 PBM (mono, gray, color) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11155 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11156 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11157 static int pbm_image_p P_ ((Lisp_Object object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11158 static int pbm_load P_ ((struct frame *f, struct image *img)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11159 static int pbm_scan_number P_ ((unsigned char **, unsigned char *)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11160 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11161 /* The symbol `pbm' identifying images of this type. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11162 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11163 Lisp_Object Qpbm; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11164 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11165 /* Indices of image specification fields in gs_format, below. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11166 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11167 enum pbm_keyword_index |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11168 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11169 PBM_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11170 PBM_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11171 PBM_DATA, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11172 PBM_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11173 PBM_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11174 PBM_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11175 PBM_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11176 PBM_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11177 PBM_MASK, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11178 PBM_FOREGROUND, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11179 PBM_BACKGROUND, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11180 PBM_LAST |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11181 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11182 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11183 /* Vector of image_keyword structures describing the format |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11184 of valid user-defined image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11185 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11186 static struct image_keyword pbm_format[PBM_LAST] = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11187 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11188 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11189 {":file", IMAGE_STRING_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11190 {":data", IMAGE_STRING_VALUE, 0}, |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
11191 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
11192 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11193 {":relief", IMAGE_INTEGER_VALUE, 0}, |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
11194 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11195 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11196 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11197 {":foreground", IMAGE_STRING_OR_NIL_VALUE, 0}, |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11198 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11199 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11200 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11201 /* Structure describing the image type `pbm'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11202 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11203 static struct image_type pbm_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11204 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11205 &Qpbm, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11206 pbm_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11207 pbm_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11208 x_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11209 NULL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11210 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11211 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11212 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11213 /* Return non-zero if OBJECT is a valid PBM image specification. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11214 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11215 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11216 pbm_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11217 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11218 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11219 struct image_keyword fmt[PBM_LAST]; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11220 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11221 bcopy (pbm_format, fmt, sizeof fmt); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11222 |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
11223 if (!parse_image_spec (object, fmt, PBM_LAST, Qpbm)) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11224 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11225 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11226 /* Must specify either :data or :file. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11227 return fmt[PBM_DATA].count + fmt[PBM_FILE].count == 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11228 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11229 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11230 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11231 /* Scan a decimal number from *S and return it. Advance *S while |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11232 reading the number. END is the end of the string. Value is -1 at |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11233 end of input. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11234 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11235 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11236 pbm_scan_number (s, end) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11237 unsigned char **s, *end; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11238 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11239 int c, val = -1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11240 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11241 while (*s < end) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11242 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11243 /* Skip white-space. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11244 while (*s < end && (c = *(*s)++, isspace (c))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11245 ; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11246 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11247 if (c == '#') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11248 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11249 /* Skip comment to end of line. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11250 while (*s < end && (c = *(*s)++, c != '\n')) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11251 ; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11252 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11253 else if (isdigit (c)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11254 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11255 /* Read decimal number. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11256 val = c - '0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11257 while (*s < end && (c = *(*s)++, isdigit (c))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11258 val = 10 * val + c - '0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11259 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11260 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11261 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11262 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11263 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11264 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11265 return val; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11266 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11267 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11268 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11269 /* Read FILE into memory. Value is a pointer to a buffer allocated |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11270 with xmalloc holding FILE's contents. Value is null if an error |
46272 | 11271 occurred. *SIZE is set to the size of the file. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11272 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11273 static char * |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11274 pbm_read_file (file, size) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11275 Lisp_Object file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11276 int *size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11277 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11278 FILE *fp = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11279 char *buf = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11280 struct stat st; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11281 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
11282 if (stat (SDATA (file), &st) == 0 |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
11283 && (fp = fopen (SDATA (file), "r")) != NULL |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11284 && (buf = (char *) xmalloc (st.st_size), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11285 fread (buf, 1, st.st_size, fp) == st.st_size)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11286 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11287 *size = st.st_size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11288 fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11289 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11290 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11291 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11292 if (fp) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11293 fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11294 if (buf) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11295 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11296 xfree (buf); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11297 buf = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11298 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11299 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11300 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11301 return buf; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11302 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11303 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11304 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11305 /* Load PBM image IMG for use on frame F. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11306 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11307 static int |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11308 pbm_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11309 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11310 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11311 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11312 int raw_p, x, y; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11313 int width, height, max_color_idx = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11314 XImage *ximg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11315 Lisp_Object file, specified_file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11316 enum {PBM_MONO, PBM_GRAY, PBM_COLOR} type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11317 struct gcpro gcpro1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11318 unsigned char *contents = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11319 unsigned char *end, *p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11320 int size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11321 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11322 specified_file = image_spec_value (img->spec, QCfile, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11323 file = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11324 GCPRO1 (file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11325 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11326 if (STRINGP (specified_file)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11327 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11328 file = x_find_image_file (specified_file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11329 if (!STRINGP (file)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11330 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11331 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11332 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11333 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11334 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11335 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
11336 contents = slurp_file (SDATA (file), &size); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11337 if (contents == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11338 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11339 image_error ("Error reading `%s'", file, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11340 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11341 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11342 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11343 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11344 p = contents; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11345 end = contents + size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11346 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11347 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11348 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11349 Lisp_Object data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11350 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:
46293
diff
changeset
|
11351 p = SDATA (data); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
11352 end = p + SBYTES (data); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11353 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11354 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11355 /* Check magic number. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11356 if (end - p < 2 || *p++ != 'P') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11357 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11358 image_error ("Not a PBM image: `%s'", img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11359 error: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11360 xfree (contents); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11361 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11362 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11363 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11364 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11365 switch (*p++) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11366 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11367 case '1': |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11368 raw_p = 0, type = PBM_MONO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11369 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11370 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11371 case '2': |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11372 raw_p = 0, type = PBM_GRAY; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11373 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11374 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11375 case '3': |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11376 raw_p = 0, type = PBM_COLOR; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11377 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11378 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11379 case '4': |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11380 raw_p = 1, type = PBM_MONO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11381 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11382 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11383 case '5': |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11384 raw_p = 1, type = PBM_GRAY; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11385 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11386 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11387 case '6': |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11388 raw_p = 1, type = PBM_COLOR; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11389 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11390 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11391 default: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11392 image_error ("Not a PBM image: `%s'", img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11393 goto error; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11394 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11395 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11396 /* Read width, height, maximum color-component. Characters |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11397 starting with `#' up to the end of a line are ignored. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11398 width = pbm_scan_number (&p, end); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11399 height = pbm_scan_number (&p, end); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11400 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11401 if (type != PBM_MONO) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11402 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11403 max_color_idx = pbm_scan_number (&p, end); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11404 if (raw_p && max_color_idx > 255) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11405 max_color_idx = 255; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11406 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11407 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11408 if (width < 0 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11409 || height < 0 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11410 || (type != PBM_MONO && max_color_idx < 0)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11411 goto error; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11412 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11413 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11414 goto error; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11415 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11416 #if 0 /* TODO: color tables. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11417 /* Initialize the color hash table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11418 init_color_table (); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11419 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11420 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11421 if (type == PBM_MONO) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11422 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11423 int c = 0, g; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11424 struct image_keyword fmt[PBM_LAST]; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11425 unsigned long fg = FRAME_FOREGROUND_PIXEL (f); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11426 unsigned long bg = FRAME_BACKGROUND_PIXEL (f); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11427 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11428 /* Parse the image specification. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11429 bcopy (pbm_format, fmt, sizeof fmt); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11430 parse_image_spec (img->spec, fmt, PBM_LAST, Qpbm); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11431 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11432 /* Get foreground and background colors, maybe allocate colors. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11433 if (fmt[PBM_FOREGROUND].count |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11434 && STRINGP (fmt[PBM_FOREGROUND].value)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11435 fg = x_alloc_image_color (f, img, fmt[PBM_FOREGROUND].value, fg); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11436 if (fmt[PBM_BACKGROUND].count |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11437 && STRINGP (fmt[PBM_BACKGROUND].value)) |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11438 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11439 bg = x_alloc_image_color (f, img, fmt[PBM_BACKGROUND].value, bg); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11440 img->background = bg; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11441 img->background_valid = 1; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11442 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11443 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11444 for (y = 0; y < height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11445 for (x = 0; x < width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11446 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11447 if (raw_p) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11448 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11449 if ((x & 7) == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11450 c = *p++; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11451 g = c & 0x80; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11452 c <<= 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11453 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11454 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11455 g = pbm_scan_number (&p, end); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11456 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11457 XPutPixel (ximg, x, y, g ? fg : bg); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11458 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11459 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11460 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11461 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11462 for (y = 0; y < height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11463 for (x = 0; x < width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11464 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11465 int r, g, b; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11466 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11467 if (type == PBM_GRAY) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11468 r = g = b = raw_p ? *p++ : pbm_scan_number (&p, end); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11469 else if (raw_p) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11470 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11471 r = *p++; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11472 g = *p++; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11473 b = *p++; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11474 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11475 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11476 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11477 r = pbm_scan_number (&p, end); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11478 g = pbm_scan_number (&p, end); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11479 b = pbm_scan_number (&p, end); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11480 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11481 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11482 if (r < 0 || g < 0 || b < 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11483 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11484 x_destroy_x_image (ximg); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11485 image_error ("Invalid pixel value in image `%s'", |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11486 img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11487 goto error; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11488 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11489 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11490 /* RGB values are now in the range 0..max_color_idx. |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11491 Scale this to the range 0..0xff supported by W32. */ |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11492 r = (int) ((double) r * 255 / max_color_idx); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11493 g = (int) ((double) g * 255 / max_color_idx); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11494 b = (int) ((double) b * 255 / max_color_idx); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11495 XPutPixel (ximg, x, y, |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11496 #if 0 /* TODO: color tables. */ |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11497 lookup_rgb_color (f, r, g, b)); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11498 #else |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11499 PALETTERGB (r, g, b)); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11500 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11501 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11502 } |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11503 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11504 #if 0 /* TODO: color tables. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11505 /* Store in IMG->colors the colors allocated for the image, and |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11506 free the color table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11507 img->colors = colors_in_color_table (&img->ncolors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11508 free_color_table (); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
11509 #endif |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11510 /* Maybe fill in the background field while we have ximg handy. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11511 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11512 IMAGE_BACKGROUND (img, f, ximg); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11513 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11514 /* Put the image into a pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11515 x_put_x_image (f, ximg, img->pixmap, width, height); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11516 x_destroy_x_image (ximg); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11517 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11518 img->width = width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11519 img->height = height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11520 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11521 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11522 xfree (contents); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11523 return 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11524 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11525 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11526 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11527 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11528 PNG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11529 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11530 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11531 #if HAVE_PNG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11532 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11533 #include <png.h> |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11534 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11535 /* Function prototypes. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11536 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11537 static int png_image_p P_ ((Lisp_Object object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11538 static int png_load P_ ((struct frame *f, struct image *img)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11539 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11540 /* The symbol `png' identifying images of this type. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11541 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11542 Lisp_Object Qpng; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11543 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11544 /* Indices of image specification fields in png_format, below. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11545 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11546 enum png_keyword_index |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11547 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11548 PNG_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11549 PNG_DATA, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11550 PNG_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11551 PNG_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11552 PNG_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11553 PNG_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11554 PNG_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11555 PNG_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11556 PNG_MASK, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11557 PNG_BACKGROUND, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11558 PNG_LAST |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11559 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11560 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11561 /* Vector of image_keyword structures describing the format |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11562 of valid user-defined image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11563 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11564 static struct image_keyword png_format[PNG_LAST] = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11565 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11566 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11567 {":data", IMAGE_STRING_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11568 {":file", IMAGE_STRING_VALUE, 0}, |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
11569 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
11570 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11571 {":relief", IMAGE_INTEGER_VALUE, 0}, |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
11572 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11573 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11574 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11575 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11576 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11577 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11578 /* Structure describing the image type `png'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11579 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11580 static struct image_type png_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11581 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11582 &Qpng, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11583 png_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11584 png_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11585 x_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11586 NULL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11587 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11588 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11589 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11590 /* Return non-zero if OBJECT is a valid PNG image specification. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11591 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11592 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11593 png_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11594 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11595 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11596 struct image_keyword fmt[PNG_LAST]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11597 bcopy (png_format, fmt, sizeof fmt); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11598 |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
11599 if (!parse_image_spec (object, fmt, PNG_LAST, Qpng)) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11600 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11601 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11602 /* Must specify either the :data or :file keyword. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11603 return fmt[PNG_FILE].count + fmt[PNG_DATA].count == 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11604 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11605 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11606 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11607 /* Error and warning handlers installed when the PNG library |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11608 is initialized. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11609 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11610 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11611 my_png_error (png_ptr, msg) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11612 png_struct *png_ptr; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11613 char *msg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11614 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11615 xassert (png_ptr != NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11616 image_error ("PNG error: %s", build_string (msg), Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11617 longjmp (png_ptr->jmpbuf, 1); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11618 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11619 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11620 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11621 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11622 my_png_warning (png_ptr, msg) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11623 png_struct *png_ptr; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11624 char *msg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11625 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11626 xassert (png_ptr != NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11627 image_error ("PNG warning: %s", build_string (msg), Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11628 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11629 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11630 /* Memory source for PNG decoding. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11631 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11632 struct png_memory_storage |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11633 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11634 unsigned char *bytes; /* The data */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11635 size_t len; /* How big is it? */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11636 int index; /* Where are we? */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11637 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11638 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11639 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11640 /* Function set as reader function when reading PNG image from memory. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11641 PNG_PTR is a pointer to the PNG control structure. Copy LENGTH |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11642 bytes from the input to DATA. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11643 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11644 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11645 png_read_from_memory (png_ptr, data, length) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11646 png_structp png_ptr; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11647 png_bytep data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11648 png_size_t length; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11649 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11650 struct png_memory_storage *tbr |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11651 = (struct png_memory_storage *) png_get_io_ptr (png_ptr); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11652 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11653 if (length > tbr->len - tbr->index) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11654 png_error (png_ptr, "Read error"); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11655 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11656 bcopy (tbr->bytes + tbr->index, data, length); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11657 tbr->index = tbr->index + length; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11658 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11659 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11660 /* Load PNG image IMG for use on frame F. Value is non-zero if |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11661 successful. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11662 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11663 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11664 png_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11665 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11666 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11667 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11668 Lisp_Object file, specified_file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11669 Lisp_Object specified_data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11670 int x, y, i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11671 XImage *ximg, *mask_img = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11672 struct gcpro gcpro1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11673 png_struct *png_ptr = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11674 png_info *info_ptr = NULL, *end_info = NULL; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11675 FILE *volatile fp = NULL; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11676 png_byte sig[8]; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11677 png_byte *volatile pixels = NULL; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11678 png_byte **volatile rows = NULL; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11679 png_uint_32 width, height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11680 int bit_depth, color_type, interlace_type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11681 png_byte channels; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11682 png_uint_32 row_bytes; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11683 int transparent_p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11684 char *gamma_str; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11685 double screen_gamma, image_gamma; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11686 int intent; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11687 struct png_memory_storage tbr; /* Data to be read */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11688 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11689 /* Find out what file to load. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11690 specified_file = image_spec_value (img->spec, QCfile, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11691 specified_data = image_spec_value (img->spec, QCdata, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11692 file = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11693 GCPRO1 (file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11694 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11695 if (NILP (specified_data)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11696 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11697 file = x_find_image_file (specified_file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11698 if (!STRINGP (file)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11699 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11700 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11701 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11702 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11703 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11704 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11705 /* Open the image file. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
11706 fp = fopen (SDATA (file), "rb"); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11707 if (!fp) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11708 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11709 image_error ("Cannot open image file `%s'", file, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11710 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11711 fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11712 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11713 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11714 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11715 /* Check PNG signature. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11716 if (fread (sig, 1, sizeof sig, fp) != sizeof sig |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11717 || !png_check_sig (sig, sizeof sig)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11718 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11719 image_error ("Not a PNG file:` %s'", file, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11720 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11721 fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11722 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11723 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11724 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11725 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11726 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11727 /* Read from memory. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
11728 tbr.bytes = SDATA (specified_data); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
11729 tbr.len = SBYTES (specified_data); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11730 tbr.index = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11731 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11732 /* Check PNG signature. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11733 if (tbr.len < sizeof sig |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11734 || !png_check_sig (tbr.bytes, sizeof sig)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11735 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11736 image_error ("Not a PNG image: `%s'", img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11737 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11738 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11739 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11740 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11741 /* Need to skip past the signature. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11742 tbr.bytes += sizeof (sig); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11743 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11744 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11745 /* Initialize read and info structs for PNG lib. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11746 png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11747 my_png_error, my_png_warning); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11748 if (!png_ptr) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11749 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11750 if (fp) fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11751 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11752 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11753 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11754 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11755 info_ptr = png_create_info_struct (png_ptr); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11756 if (!info_ptr) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11757 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11758 png_destroy_read_struct (&png_ptr, NULL, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11759 if (fp) fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11760 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11761 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11762 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11763 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11764 end_info = png_create_info_struct (png_ptr); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11765 if (!end_info) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11766 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11767 png_destroy_read_struct (&png_ptr, &info_ptr, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11768 if (fp) fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11769 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11770 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11771 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11772 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11773 /* Set error jump-back. We come back here when the PNG library |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11774 detects an error. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11775 if (setjmp (png_ptr->jmpbuf)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11776 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11777 error: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11778 if (png_ptr) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11779 png_destroy_read_struct (&png_ptr, &info_ptr, &end_info); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11780 xfree (pixels); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11781 xfree (rows); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11782 if (fp) fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11783 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11784 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11785 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11786 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11787 /* Read image info. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11788 if (!NILP (specified_data)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11789 png_set_read_fn (png_ptr, (void *) &tbr, png_read_from_memory); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11790 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11791 png_init_io (png_ptr, fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11792 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11793 png_set_sig_bytes (png_ptr, sizeof sig); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11794 png_read_info (png_ptr, info_ptr); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11795 png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11796 &interlace_type, NULL, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11797 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11798 /* If image contains simply transparency data, we prefer to |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11799 construct a clipping mask. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11800 if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11801 transparent_p = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11802 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11803 transparent_p = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11804 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11805 /* This function is easier to write if we only have to handle |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11806 one data format: RGB or RGBA with 8 bits per channel. Let's |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11807 transform other formats into that format. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11808 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11809 /* Strip more than 8 bits per channel. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11810 if (bit_depth == 16) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11811 png_set_strip_16 (png_ptr); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11812 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11813 /* Expand data to 24 bit RGB, or 8 bit grayscale, with alpha channel |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11814 if available. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11815 png_set_expand (png_ptr); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11816 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11817 /* Convert grayscale images to RGB. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11818 if (color_type == PNG_COLOR_TYPE_GRAY |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11819 || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11820 png_set_gray_to_rgb (png_ptr); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11821 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11822 /* The value 2.2 is a guess for PC monitors from PNG example.c. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11823 gamma_str = getenv ("SCREEN_GAMMA"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11824 screen_gamma = gamma_str ? atof (gamma_str) : 2.2; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11825 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11826 /* Tell the PNG lib to handle gamma correction for us. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11827 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11828 #if defined(PNG_READ_sRGB_SUPPORTED) || defined(PNG_WRITE_sRGB_SUPPORTED) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11829 if (png_get_sRGB (png_ptr, info_ptr, &intent)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11830 /* There is a special chunk in the image specifying the gamma. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11831 png_set_sRGB (png_ptr, info_ptr, intent); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11832 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11833 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11834 if (png_get_gAMA (png_ptr, info_ptr, &image_gamma)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11835 /* Image contains gamma information. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11836 png_set_gamma (png_ptr, screen_gamma, image_gamma); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11837 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11838 /* Use a default of 0.5 for the image gamma. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11839 png_set_gamma (png_ptr, screen_gamma, 0.5); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11840 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11841 /* Handle alpha channel by combining the image with a background |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11842 color. Do this only if a real alpha channel is supplied. For |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11843 simple transparency, we prefer a clipping mask. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11844 if (!transparent_p) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11845 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11846 png_color_16 *image_background; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11847 Lisp_Object specified_bg |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11848 = image_spec_value (img->spec, QCbackground, NULL); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11849 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11850 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11851 if (STRINGP (specified_bg)) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11852 /* The user specified `:background', use that. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11853 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11854 COLORREF color; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
11855 if (w32_defined_color (f, SDATA (specified_bg), &color, 0)) |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11856 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11857 png_color_16 user_bg; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11858 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11859 bzero (&user_bg, sizeof user_bg); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11860 user_bg.red = color.red; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11861 user_bg.green = color.green; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11862 user_bg.blue = color.blue; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11863 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11864 png_set_background (png_ptr, &user_bg, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11865 PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11866 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11867 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11868 else if (png_get_bKGD (png_ptr, info_ptr, &image_background)) |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11869 /* Image contains a background color with which to |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11870 combine the image. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11871 png_set_background (png_ptr, image_background, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11872 PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11873 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11874 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11875 /* Image does not contain a background color with which |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11876 to combine the image data via an alpha channel. Use |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11877 the frame's background instead. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11878 XColor color; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11879 Colormap cmap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11880 png_color_16 frame_background; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11881 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11882 cmap = FRAME_X_COLORMAP (f); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11883 color.pixel = FRAME_BACKGROUND_PIXEL (f); |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11884 x_query_color (f, &color); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11885 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11886 bzero (&frame_background, sizeof frame_background); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11887 frame_background.red = color.red; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11888 frame_background.green = color.green; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11889 frame_background.blue = color.blue; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11890 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11891 png_set_background (png_ptr, &frame_background, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11892 PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11893 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11894 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11895 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11896 /* Update info structure. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11897 png_read_update_info (png_ptr, info_ptr); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11898 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11899 /* Get number of channels. Valid values are 1 for grayscale images |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11900 and images with a palette, 2 for grayscale images with transparency |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11901 information (alpha channel), 3 for RGB images, and 4 for RGB |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11902 images with alpha channel, i.e. RGBA. If conversions above were |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11903 sufficient we should only have 3 or 4 channels here. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11904 channels = png_get_channels (png_ptr, info_ptr); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11905 xassert (channels == 3 || channels == 4); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11906 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11907 /* Number of bytes needed for one row of the image. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11908 row_bytes = png_get_rowbytes (png_ptr, info_ptr); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11909 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11910 /* Allocate memory for the image. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11911 pixels = (png_byte *) xmalloc (row_bytes * height * sizeof *pixels); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11912 rows = (png_byte **) xmalloc (height * sizeof *rows); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11913 for (i = 0; i < height; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11914 rows[i] = pixels + i * row_bytes; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11915 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11916 /* Read the entire image. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11917 png_read_image (png_ptr, rows); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11918 png_read_end (png_ptr, info_ptr); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11919 if (fp) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11920 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11921 fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11922 fp = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11923 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11924 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11925 /* Create the X image and pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11926 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11927 &img->pixmap)) |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11928 goto error; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11929 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11930 /* Create an image and pixmap serving as mask if the PNG image |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11931 contains an alpha channel. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11932 if (channels == 4 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11933 && !transparent_p |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11934 && !x_create_x_image_and_pixmap (f, width, height, 1, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11935 &mask_img, &img->mask)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11936 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11937 x_destroy_x_image (ximg); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11938 XFreePixmap (FRAME_W32_DISPLAY (f), img->pixmap); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11939 img->pixmap = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11940 goto error; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11941 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11942 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11943 /* Fill the X image and mask from PNG data. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11944 init_color_table (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11945 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11946 for (y = 0; y < height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11947 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11948 png_byte *p = rows[y]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11949 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11950 for (x = 0; x < width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11951 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11952 unsigned r, g, b; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11953 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11954 r = *p++ << 8; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11955 g = *p++ << 8; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11956 b = *p++ << 8; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11957 XPutPixel (ximg, x, y, lookup_rgb_color (f, r, g, b)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11958 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11959 /* An alpha channel, aka mask channel, associates variable |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11960 transparency with an image. Where other image formats |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11961 support binary transparency---fully transparent or fully |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11962 opaque---PNG allows up to 254 levels of partial transparency. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11963 The PNG library implements partial transparency by combining |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11964 the image with a specified background color. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11965 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11966 I'm not sure how to handle this here nicely: because the |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11967 background on which the image is displayed may change, for |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11968 real alpha channel support, it would be necessary to create |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11969 a new image for each possible background. |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11970 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11971 What I'm doing now is that a mask is created if we have |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11972 boolean transparency information. Otherwise I'm using |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11973 the frame's background color to combine the image with. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11974 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11975 if (channels == 4) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11976 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11977 if (mask_img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11978 XPutPixel (mask_img, x, y, *p > 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11979 ++p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11980 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11981 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11982 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11983 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11984 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11985 /* Set IMG's background color from the PNG image, unless the user |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11986 overrode it. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11987 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11988 png_color_16 *bg; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11989 if (png_get_bKGD (png_ptr, info_ptr, &bg)) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11990 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11991 img->background = lookup_rgb_color (f, bg->red, bg->green, bg->blue); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11992 img->background_valid = 1; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11993 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11994 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11995 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11996 /* Remember colors allocated for this image. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11997 img->colors = colors_in_color_table (&img->ncolors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11998 free_color_table (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11999 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12000 /* Clean up. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12001 png_destroy_read_struct (&png_ptr, &info_ptr, &end_info); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12002 xfree (rows); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12003 xfree (pixels); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12004 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12005 img->width = width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12006 img->height = height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12007 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12008 /* Maybe fill in the background field while we have ximg handy. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12009 IMAGE_BACKGROUND (img, f, ximg); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12010 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12011 /* Put the image into the pixmap, then free the X image and its buffer. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12012 x_put_x_image (f, ximg, img->pixmap, width, height); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12013 x_destroy_x_image (ximg); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12014 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12015 /* Same for the mask. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12016 if (mask_img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12017 { |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12018 /* Fill in the background_transparent field while we have the mask |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12019 handy. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12020 image_background_transparent (img, f, mask_img); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12021 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12022 x_put_x_image (f, mask_img, img->mask, img->width, img->height); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12023 x_destroy_x_image (mask_img); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12024 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12025 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12026 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12027 return 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12028 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12029 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12030 #endif /* HAVE_PNG != 0 */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12031 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12032 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12033 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12034 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12035 JPEG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12036 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12037 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12038 #if HAVE_JPEG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12039 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12040 /* Work around a warning about HAVE_STDLIB_H being redefined in |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12041 jconfig.h. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12042 #ifdef HAVE_STDLIB_H |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12043 #define HAVE_STDLIB_H_1 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12044 #undef HAVE_STDLIB_H |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12045 #endif /* HAVE_STLIB_H */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12046 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12047 #include <jpeglib.h> |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12048 #include <jerror.h> |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12049 #include <setjmp.h> |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12050 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12051 #ifdef HAVE_STLIB_H_1 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12052 #define HAVE_STDLIB_H 1 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12053 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12054 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12055 static int jpeg_image_p P_ ((Lisp_Object object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12056 static int jpeg_load P_ ((struct frame *f, struct image *img)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12057 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12058 /* The symbol `jpeg' identifying images of this type. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12059 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12060 Lisp_Object Qjpeg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12061 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12062 /* Indices of image specification fields in gs_format, below. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12063 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12064 enum jpeg_keyword_index |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12065 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12066 JPEG_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12067 JPEG_DATA, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12068 JPEG_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12069 JPEG_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12070 JPEG_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12071 JPEG_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12072 JPEG_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12073 JPEG_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12074 JPEG_MASK, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12075 JPEG_BACKGROUND, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12076 JPEG_LAST |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12077 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12078 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12079 /* Vector of image_keyword structures describing the format |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12080 of valid user-defined image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12081 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12082 static struct image_keyword jpeg_format[JPEG_LAST] = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12083 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12084 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12085 {":data", IMAGE_STRING_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12086 {":file", IMAGE_STRING_VALUE, 0}, |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
12087 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
12088 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12089 {":relief", IMAGE_INTEGER_VALUE, 0}, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12090 {":conversions", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12091 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12092 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12093 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12094 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12095 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12096 /* Structure describing the image type `jpeg'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12097 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12098 static struct image_type jpeg_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12099 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12100 &Qjpeg, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12101 jpeg_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12102 jpeg_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12103 x_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12104 NULL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12105 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12106 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12107 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12108 /* Return non-zero if OBJECT is a valid JPEG image specification. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12109 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12110 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12111 jpeg_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12112 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12113 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12114 struct image_keyword fmt[JPEG_LAST]; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12115 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12116 bcopy (jpeg_format, fmt, sizeof fmt); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12117 |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
12118 if (!parse_image_spec (object, fmt, JPEG_LAST, Qjpeg)) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12119 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12120 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12121 /* Must specify either the :data or :file keyword. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12122 return fmt[JPEG_FILE].count + fmt[JPEG_DATA].count == 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12123 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12124 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12125 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12126 struct my_jpeg_error_mgr |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12127 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12128 struct jpeg_error_mgr pub; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12129 jmp_buf setjmp_buffer; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12130 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12131 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12132 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12133 my_error_exit (cinfo) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12134 j_common_ptr cinfo; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12135 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12136 struct my_jpeg_error_mgr *mgr = (struct my_jpeg_error_mgr *) cinfo->err; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12137 longjmp (mgr->setjmp_buffer, 1); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12138 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12139 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12140 /* Init source method for JPEG data source manager. Called by |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12141 jpeg_read_header() before any data is actually read. See |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12142 libjpeg.doc from the JPEG lib distribution. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12143 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12144 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12145 our_init_source (cinfo) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12146 j_decompress_ptr cinfo; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12147 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12148 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12149 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12150 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12151 /* Fill input buffer method for JPEG data source manager. Called |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12152 whenever more data is needed. We read the whole image in one step, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12153 so this only adds a fake end of input marker at the end. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12154 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12155 static boolean |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12156 our_fill_input_buffer (cinfo) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12157 j_decompress_ptr cinfo; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12158 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12159 /* Insert a fake EOI marker. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12160 struct jpeg_source_mgr *src = cinfo->src; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12161 static JOCTET buffer[2]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12162 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12163 buffer[0] = (JOCTET) 0xFF; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12164 buffer[1] = (JOCTET) JPEG_EOI; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12165 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12166 src->next_input_byte = buffer; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12167 src->bytes_in_buffer = 2; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12168 return TRUE; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12169 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12170 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12171 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12172 /* Method to skip over NUM_BYTES bytes in the image data. CINFO->src |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12173 is the JPEG data source manager. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12174 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12175 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12176 our_skip_input_data (cinfo, num_bytes) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12177 j_decompress_ptr cinfo; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12178 long num_bytes; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12179 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12180 struct jpeg_source_mgr *src = (struct jpeg_source_mgr *) cinfo->src; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12181 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12182 if (src) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12183 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12184 if (num_bytes > src->bytes_in_buffer) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12185 ERREXIT (cinfo, JERR_INPUT_EOF); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12186 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12187 src->bytes_in_buffer -= num_bytes; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12188 src->next_input_byte += num_bytes; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12189 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12190 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12191 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12192 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12193 /* Method to terminate data source. Called by |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12194 jpeg_finish_decompress() after all data has been processed. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12195 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12196 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12197 our_term_source (cinfo) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12198 j_decompress_ptr cinfo; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12199 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12200 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12201 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12202 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12203 /* Set up the JPEG lib for reading an image from DATA which contains |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12204 LEN bytes. CINFO is the decompression info structure created for |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12205 reading the image. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12206 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12207 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12208 jpeg_memory_src (cinfo, data, len) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12209 j_decompress_ptr cinfo; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12210 JOCTET *data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12211 unsigned int len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12212 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12213 struct jpeg_source_mgr *src; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12214 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12215 if (cinfo->src == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12216 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12217 /* First time for this JPEG object? */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12218 cinfo->src = (struct jpeg_source_mgr *) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12219 (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12220 sizeof (struct jpeg_source_mgr)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12221 src = (struct jpeg_source_mgr *) cinfo->src; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12222 src->next_input_byte = data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12223 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12224 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12225 src = (struct jpeg_source_mgr *) cinfo->src; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12226 src->init_source = our_init_source; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12227 src->fill_input_buffer = our_fill_input_buffer; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12228 src->skip_input_data = our_skip_input_data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12229 src->resync_to_restart = jpeg_resync_to_restart; /* Use default method. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12230 src->term_source = our_term_source; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12231 src->bytes_in_buffer = len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12232 src->next_input_byte = data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12233 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12234 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12235 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12236 /* Load image IMG for use on frame F. Patterned after example.c |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12237 from the JPEG lib. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12238 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12239 static int |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12240 jpeg_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12241 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12242 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12243 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12244 struct jpeg_decompress_struct cinfo; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12245 struct my_jpeg_error_mgr mgr; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12246 Lisp_Object file, specified_file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12247 Lisp_Object specified_data; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12248 FILE * volatile fp = NULL; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12249 JSAMPARRAY buffer; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12250 int row_stride, x, y; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12251 XImage *ximg = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12252 int rc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12253 unsigned long *colors; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12254 int width, height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12255 struct gcpro gcpro1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12256 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12257 /* Open the JPEG file. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12258 specified_file = image_spec_value (img->spec, QCfile, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12259 specified_data = image_spec_value (img->spec, QCdata, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12260 file = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12261 GCPRO1 (file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12262 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12263 if (NILP (specified_data)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12264 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12265 file = x_find_image_file (specified_file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12266 if (!STRINGP (file)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12267 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12268 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12269 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12270 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12271 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12272 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
12273 fp = fopen (SDATA (file), "r"); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12274 if (fp == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12275 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12276 image_error ("Cannot open `%s'", file, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12277 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12278 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12279 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12280 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12281 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12282 /* Customize libjpeg's error handling to call my_error_exit when an |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12283 error is detected. This function will perform a longjmp. */ |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12284 cinfo.err = jpeg_std_error (&mgr.pub); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12285 mgr.pub.error_exit = my_error_exit; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12286 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12287 if ((rc = setjmp (mgr.setjmp_buffer)) != 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12288 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12289 if (rc == 1) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12290 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12291 /* Called from my_error_exit. Display a JPEG error. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12292 char buffer[JMSG_LENGTH_MAX]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12293 cinfo.err->format_message ((j_common_ptr) &cinfo, buffer); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12294 image_error ("Error reading JPEG image `%s': %s", img->spec, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12295 build_string (buffer)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12296 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12297 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12298 /* Close the input file and destroy the JPEG object. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12299 if (fp) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12300 fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12301 jpeg_destroy_decompress (&cinfo); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12302 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12303 /* If we already have an XImage, free that. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12304 x_destroy_x_image (ximg); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12305 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12306 /* Free pixmap and colors. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12307 x_clear_image (f, img); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12308 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12309 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12310 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12311 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12312 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12313 /* Create the JPEG decompression object. Let it read from fp. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12314 Read the JPEG image header. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12315 jpeg_create_decompress (&cinfo); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12316 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12317 if (NILP (specified_data)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12318 jpeg_stdio_src (&cinfo, fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12319 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
12320 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:
46293
diff
changeset
|
12321 SBYTES (specified_data)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12322 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12323 jpeg_read_header (&cinfo, TRUE); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12324 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12325 /* Customize decompression so that color quantization will be used. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12326 Start decompression. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12327 cinfo.quantize_colors = TRUE; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12328 jpeg_start_decompress (&cinfo); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12329 width = img->width = cinfo.output_width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12330 height = img->height = cinfo.output_height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12331 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12332 /* Create X image and pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12333 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12334 &img->pixmap)) |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12335 longjmp (mgr.setjmp_buffer, 2); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12336 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12337 /* Allocate colors. When color quantization is used, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12338 cinfo.actual_number_of_colors has been set with the number of |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12339 colors generated, and cinfo.colormap is a two-dimensional array |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12340 of color indices in the range 0..cinfo.actual_number_of_colors. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12341 No more than 255 colors will be generated. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12342 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12343 int i, ir, ig, ib; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12344 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12345 if (cinfo.out_color_components > 2) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12346 ir = 0, ig = 1, ib = 2; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12347 else if (cinfo.out_color_components > 1) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12348 ir = 0, ig = 1, ib = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12349 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12350 ir = 0, ig = 0, ib = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12351 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12352 /* Use the color table mechanism because it handles colors that |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12353 cannot be allocated nicely. Such colors will be replaced with |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12354 a default color, and we don't have to care about which colors |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12355 can be freed safely, and which can't. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12356 init_color_table (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12357 colors = (unsigned long *) alloca (cinfo.actual_number_of_colors |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12358 * sizeof *colors); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12359 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12360 for (i = 0; i < cinfo.actual_number_of_colors; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12361 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12362 /* Multiply RGB values with 255 because X expects RGB values |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12363 in the range 0..0xffff. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12364 int r = cinfo.colormap[ir][i] << 8; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12365 int g = cinfo.colormap[ig][i] << 8; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12366 int b = cinfo.colormap[ib][i] << 8; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12367 colors[i] = lookup_rgb_color (f, r, g, b); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12368 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12369 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12370 /* Remember those colors actually allocated. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12371 img->colors = colors_in_color_table (&img->ncolors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12372 free_color_table (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12373 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12374 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12375 /* Read pixels. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12376 row_stride = width * cinfo.output_components; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12377 buffer = cinfo.mem->alloc_sarray ((j_common_ptr) &cinfo, JPOOL_IMAGE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12378 row_stride, 1); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12379 for (y = 0; y < height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12380 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12381 jpeg_read_scanlines (&cinfo, buffer, 1); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12382 for (x = 0; x < cinfo.output_width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12383 XPutPixel (ximg, x, y, colors[buffer[0][x]]); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12384 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12385 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12386 /* Clean up. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12387 jpeg_finish_decompress (&cinfo); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12388 jpeg_destroy_decompress (&cinfo); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12389 if (fp) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12390 fclose (fp); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12391 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12392 /* Maybe fill in the background field while we have ximg handy. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12393 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12394 IMAGE_BACKGROUND (img, f, ximg); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12395 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12396 /* Put the image into the pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12397 x_put_x_image (f, ximg, img->pixmap, width, height); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12398 x_destroy_x_image (ximg); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12399 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12400 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12401 return 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12402 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12403 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12404 #endif /* HAVE_JPEG */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12405 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12406 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12407 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12408 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12409 TIFF |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12410 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12411 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12412 #if HAVE_TIFF |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12413 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12414 #include <tiffio.h> |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12415 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12416 static int tiff_image_p P_ ((Lisp_Object object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12417 static int tiff_load P_ ((struct frame *f, struct image *img)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12418 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12419 /* The symbol `tiff' identifying images of this type. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12420 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12421 Lisp_Object Qtiff; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12422 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12423 /* Indices of image specification fields in tiff_format, below. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12424 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12425 enum tiff_keyword_index |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12426 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12427 TIFF_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12428 TIFF_DATA, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12429 TIFF_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12430 TIFF_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12431 TIFF_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12432 TIFF_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12433 TIFF_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12434 TIFF_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12435 TIFF_MASK, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12436 TIFF_BACKGROUND, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12437 TIFF_LAST |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12438 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12439 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12440 /* Vector of image_keyword structures describing the format |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12441 of valid user-defined image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12442 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12443 static struct image_keyword tiff_format[TIFF_LAST] = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12444 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12445 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12446 {":data", IMAGE_STRING_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12447 {":file", IMAGE_STRING_VALUE, 0}, |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
12448 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
12449 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12450 {":relief", IMAGE_INTEGER_VALUE, 0}, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12451 {":conversions", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12452 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12453 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12454 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12455 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12456 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12457 /* Structure describing the image type `tiff'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12458 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12459 static struct image_type tiff_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12460 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12461 &Qtiff, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12462 tiff_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12463 tiff_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12464 x_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12465 NULL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12466 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12467 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12468 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12469 /* Return non-zero if OBJECT is a valid TIFF image specification. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12470 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12471 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12472 tiff_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12473 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12474 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12475 struct image_keyword fmt[TIFF_LAST]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12476 bcopy (tiff_format, fmt, sizeof fmt); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12477 |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
12478 if (!parse_image_spec (object, fmt, TIFF_LAST, Qtiff)) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12479 return 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12480 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12481 /* Must specify either the :data or :file keyword. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12482 return fmt[TIFF_FILE].count + fmt[TIFF_DATA].count == 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12483 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12484 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12485 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12486 /* Reading from a memory buffer for TIFF images Based on the PNG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12487 memory source, but we have to provide a lot of extra functions. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12488 Blah. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12489 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12490 We really only need to implement read and seek, but I am not |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12491 convinced that the TIFF library is smart enough not to destroy |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12492 itself if we only hand it the function pointers we need to |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12493 override. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12494 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12495 typedef struct |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12496 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12497 unsigned char *bytes; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12498 size_t len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12499 int index; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12500 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12501 tiff_memory_source; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12502 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12503 static size_t |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12504 tiff_read_from_memory (data, buf, size) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12505 thandle_t data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12506 tdata_t buf; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12507 tsize_t size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12508 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12509 tiff_memory_source *src = (tiff_memory_source *) data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12510 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12511 if (size > src->len - src->index) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12512 return (size_t) -1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12513 bcopy (src->bytes + src->index, buf, size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12514 src->index += size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12515 return size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12516 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12517 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12518 static size_t |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12519 tiff_write_from_memory (data, buf, size) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12520 thandle_t data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12521 tdata_t buf; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12522 tsize_t size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12523 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12524 return (size_t) -1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12525 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12526 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12527 static toff_t |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12528 tiff_seek_in_memory (data, off, whence) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12529 thandle_t data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12530 toff_t off; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12531 int whence; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12532 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12533 tiff_memory_source *src = (tiff_memory_source *) data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12534 int idx; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12535 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12536 switch (whence) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12537 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12538 case SEEK_SET: /* Go from beginning of source. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12539 idx = off; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12540 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12541 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12542 case SEEK_END: /* Go from end of source. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12543 idx = src->len + off; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12544 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12545 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12546 case SEEK_CUR: /* Go from current position. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12547 idx = src->index + off; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12548 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12549 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12550 default: /* Invalid `whence'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12551 return -1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12552 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12553 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12554 if (idx > src->len || idx < 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12555 return -1; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12556 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12557 src->index = idx; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12558 return src->index; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12559 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12560 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12561 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12562 tiff_close_memory (data) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12563 thandle_t data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12564 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12565 /* NOOP */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12566 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12567 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12568 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12569 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12570 tiff_mmap_memory (data, pbase, psize) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12571 thandle_t data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12572 tdata_t *pbase; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12573 toff_t *psize; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12574 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12575 /* It is already _IN_ memory. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12576 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12577 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12578 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12579 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12580 tiff_unmap_memory (data, base, size) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12581 thandle_t data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12582 tdata_t base; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12583 toff_t size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12584 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12585 /* We don't need to do this. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12586 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12587 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12588 static toff_t |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12589 tiff_size_of_memory (data) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12590 thandle_t data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12591 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12592 return ((tiff_memory_source *) data)->len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12593 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12594 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12595 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12596 static void |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12597 tiff_error_handler (title, format, ap) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12598 const char *title, *format; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12599 va_list ap; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12600 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12601 char buf[512]; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12602 int len; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12603 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12604 len = sprintf (buf, "TIFF error: %s ", title); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12605 vsprintf (buf + len, format, ap); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12606 add_to_log (buf, Qnil, Qnil); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12607 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12608 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12609 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12610 static void |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12611 tiff_warning_handler (title, format, ap) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12612 const char *title, *format; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12613 va_list ap; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12614 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12615 char buf[512]; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12616 int len; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12617 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12618 len = sprintf (buf, "TIFF warning: %s ", title); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12619 vsprintf (buf + len, format, ap); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12620 add_to_log (buf, Qnil, Qnil); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12621 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12622 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12623 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12624 /* Load TIFF image IMG for use on frame F. Value is non-zero if |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12625 successful. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12626 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12627 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12628 tiff_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12629 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12630 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12631 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12632 Lisp_Object file, specified_file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12633 Lisp_Object specified_data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12634 TIFF *tiff; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12635 int width, height, x, y; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12636 uint32 *buf; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12637 int rc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12638 XImage *ximg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12639 struct gcpro gcpro1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12640 tiff_memory_source memsrc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12641 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12642 specified_file = image_spec_value (img->spec, QCfile, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12643 specified_data = image_spec_value (img->spec, QCdata, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12644 file = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12645 GCPRO1 (file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12646 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12647 TIFFSetErrorHandler (tiff_error_handler); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12648 TIFFSetWarningHandler (tiff_warning_handler); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12649 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12650 if (NILP (specified_data)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12651 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12652 /* Read from a file */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12653 file = x_find_image_file (specified_file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12654 if (!STRINGP (file)) |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12655 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12656 image_error ("Cannot find image file `%s'", file, Qnil); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12657 UNGCPRO; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12658 return 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12659 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12660 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12661 /* 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:
46293
diff
changeset
|
12662 tiff = TIFFOpen (SDATA (file), "r"); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12663 if (tiff == NULL) |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12664 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12665 image_error ("Cannot open `%s'", file, Qnil); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12666 UNGCPRO; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12667 return 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12668 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12669 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12670 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12671 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12672 /* Memory source! */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
12673 memsrc.bytes = SDATA (specified_data); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
12674 memsrc.len = SBYTES (specified_data); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12675 memsrc.index = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12676 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12677 tiff = TIFFClientOpen ("memory_source", "r", &memsrc, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12678 (TIFFReadWriteProc) tiff_read_from_memory, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12679 (TIFFReadWriteProc) tiff_write_from_memory, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12680 tiff_seek_in_memory, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12681 tiff_close_memory, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12682 tiff_size_of_memory, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12683 tiff_mmap_memory, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12684 tiff_unmap_memory); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12685 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12686 if (!tiff) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12687 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12688 image_error ("Cannot open memory source for `%s'", img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12689 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12690 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12691 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12692 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12693 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12694 /* Get width and height of the image, and allocate a raster buffer |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12695 of width x height 32-bit values. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12696 TIFFGetField (tiff, TIFFTAG_IMAGEWIDTH, &width); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12697 TIFFGetField (tiff, TIFFTAG_IMAGELENGTH, &height); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12698 buf = (uint32 *) xmalloc (width * height * sizeof *buf); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12699 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12700 rc = TIFFReadRGBAImage (tiff, width, height, buf, 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12701 TIFFClose (tiff); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12702 if (!rc) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12703 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12704 image_error ("Error reading TIFF image `%s'", img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12705 xfree (buf); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12706 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12707 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12708 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12709 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12710 /* Create the X image and pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12711 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12712 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12713 xfree (buf); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12714 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12715 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12716 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12717 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12718 /* Initialize the color table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12719 init_color_table (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12720 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12721 /* Process the pixel raster. Origin is in the lower-left corner. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12722 for (y = 0; y < height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12723 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12724 uint32 *row = buf + y * width; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12725 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12726 for (x = 0; x < width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12727 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12728 uint32 abgr = row[x]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12729 int r = TIFFGetR (abgr) << 8; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12730 int g = TIFFGetG (abgr) << 8; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12731 int b = TIFFGetB (abgr) << 8; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12732 XPutPixel (ximg, x, height - 1 - y, lookup_rgb_color (f, r, g, b)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12733 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12734 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12735 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12736 /* Remember the colors allocated for the image. Free the color table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12737 img->colors = colors_in_color_table (&img->ncolors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12738 free_color_table (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12739 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12740 img->width = width; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12741 img->height = height; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12742 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12743 /* Maybe fill in the background field while we have ximg handy. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12744 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12745 IMAGE_BACKGROUND (img, f, ximg); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12746 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12747 /* Put the image into the pixmap, then free the X image and its buffer. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12748 x_put_x_image (f, ximg, img->pixmap, width, height); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12749 x_destroy_x_image (ximg); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12750 xfree (buf); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12751 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12752 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12753 return 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12754 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12755 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12756 #endif /* HAVE_TIFF != 0 */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12757 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12758 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12759 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12760 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12761 GIF |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12762 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12763 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12764 #if HAVE_GIF |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12765 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12766 #include <gif_lib.h> |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12767 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12768 static int gif_image_p P_ ((Lisp_Object object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12769 static int gif_load P_ ((struct frame *f, struct image *img)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12770 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12771 /* The symbol `gif' identifying images of this type. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12772 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12773 Lisp_Object Qgif; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12774 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12775 /* Indices of image specification fields in gif_format, below. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12776 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12777 enum gif_keyword_index |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12778 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12779 GIF_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12780 GIF_DATA, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12781 GIF_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12782 GIF_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12783 GIF_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12784 GIF_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12785 GIF_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12786 GIF_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12787 GIF_MASK, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12788 GIF_IMAGE, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12789 GIF_BACKGROUND, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12790 GIF_LAST |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12791 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12792 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12793 /* Vector of image_keyword structures describing the format |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12794 of valid user-defined image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12795 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12796 static struct image_keyword gif_format[GIF_LAST] = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12797 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12798 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12799 {":data", IMAGE_STRING_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12800 {":file", IMAGE_STRING_VALUE, 0}, |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
12801 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
12802 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12803 {":relief", IMAGE_INTEGER_VALUE, 0}, |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
12804 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12805 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12806 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12807 {":image", IMAGE_NON_NEGATIVE_INTEGER_VALUE, 0}, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12808 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12809 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12810 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12811 /* Structure describing the image type `gif'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12812 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12813 static struct image_type gif_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12814 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12815 &Qgif, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12816 gif_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12817 gif_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12818 x_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12819 NULL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12820 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12821 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12822 /* Return non-zero if OBJECT is a valid GIF image specification. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12823 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12824 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12825 gif_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12826 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12827 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12828 struct image_keyword fmt[GIF_LAST]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12829 bcopy (gif_format, fmt, sizeof fmt); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12830 |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
12831 if (!parse_image_spec (object, fmt, GIF_LAST, Qgif)) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12832 return 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12833 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12834 /* Must specify either the :data or :file keyword. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12835 return fmt[GIF_FILE].count + fmt[GIF_DATA].count == 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12836 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12837 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12838 /* Reading a GIF image from memory |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12839 Based on the PNG memory stuff to a certain extent. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12840 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12841 typedef struct |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12842 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12843 unsigned char *bytes; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12844 size_t len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12845 int index; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12846 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12847 gif_memory_source; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12848 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12849 /* Make the current memory source available to gif_read_from_memory. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12850 It's done this way because not all versions of libungif support |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12851 a UserData field in the GifFileType structure. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12852 static gif_memory_source *current_gif_memory_src; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12853 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12854 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12855 gif_read_from_memory (file, buf, len) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12856 GifFileType *file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12857 GifByteType *buf; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12858 int len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12859 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12860 gif_memory_source *src = current_gif_memory_src; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12861 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12862 if (len > src->len - src->index) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12863 return -1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12864 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12865 bcopy (src->bytes + src->index, buf, len); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12866 src->index += len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12867 return len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12868 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12869 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12870 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12871 /* Load GIF image IMG for use on frame F. Value is non-zero if |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12872 successful. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12873 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12874 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12875 gif_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12876 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12877 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12878 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12879 Lisp_Object file, specified_file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12880 Lisp_Object specified_data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12881 int rc, width, height, x, y, i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12882 XImage *ximg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12883 ColorMapObject *gif_color_map; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12884 unsigned long pixel_colors[256]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12885 GifFileType *gif; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12886 struct gcpro gcpro1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12887 Lisp_Object image; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12888 int ino, image_left, image_top, image_width, image_height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12889 gif_memory_source memsrc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12890 unsigned char *raster; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12891 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12892 specified_file = image_spec_value (img->spec, QCfile, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12893 specified_data = image_spec_value (img->spec, QCdata, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12894 file = Qnil; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
12895 GCPRO1 (file); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12896 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12897 if (NILP (specified_data)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12898 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12899 file = x_find_image_file (specified_file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12900 if (!STRINGP (file)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12901 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12902 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12903 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12904 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12905 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12906 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12907 /* Open the GIF file. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
12908 gif = DGifOpenFileName (SDATA (file)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12909 if (gif == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12910 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12911 image_error ("Cannot open `%s'", file, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12912 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12913 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12914 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12915 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12916 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12917 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12918 /* Read from memory! */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12919 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:
46293
diff
changeset
|
12920 memsrc.bytes = SDATA (specified_data); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
12921 memsrc.len = SBYTES (specified_data); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12922 memsrc.index = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12923 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12924 gif = DGifOpen(&memsrc, gif_read_from_memory); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12925 if (!gif) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12926 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12927 image_error ("Cannot open memory source `%s'", img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12928 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12929 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12930 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12931 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12932 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12933 /* Read entire contents. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12934 rc = DGifSlurp (gif); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12935 if (rc == GIF_ERROR) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12936 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12937 image_error ("Error reading `%s'", img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12938 DGifCloseFile (gif); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12939 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12940 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12941 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12942 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12943 image = image_spec_value (img->spec, QCindex, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12944 ino = INTEGERP (image) ? XFASTINT (image) : 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12945 if (ino >= gif->ImageCount) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12946 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12947 image_error ("Invalid image number `%s' in image `%s'", |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12948 image, img->spec); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12949 DGifCloseFile (gif); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12950 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12951 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12952 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12953 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12954 width = img->width = gif->SWidth; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12955 height = img->height = gif->SHeight; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12956 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12957 /* Create the X image and pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12958 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12959 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12960 DGifCloseFile (gif); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12961 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12962 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12963 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12964 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12965 /* Allocate colors. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12966 gif_color_map = gif->SavedImages[ino].ImageDesc.ColorMap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12967 if (!gif_color_map) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12968 gif_color_map = gif->SColorMap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12969 init_color_table (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12970 bzero (pixel_colors, sizeof pixel_colors); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12971 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12972 for (i = 0; i < gif_color_map->ColorCount; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12973 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12974 int r = gif_color_map->Colors[i].Red << 8; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12975 int g = gif_color_map->Colors[i].Green << 8; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12976 int b = gif_color_map->Colors[i].Blue << 8; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12977 pixel_colors[i] = lookup_rgb_color (f, r, g, b); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12978 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12979 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12980 img->colors = colors_in_color_table (&img->ncolors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12981 free_color_table (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12982 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12983 /* Clear the part of the screen image that are not covered by |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12984 the image from the GIF file. Full animated GIF support |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12985 requires more than can be done here (see the gif89 spec, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12986 disposal methods). Let's simply assume that the part |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12987 not covered by a sub-image is in the frame's background color. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12988 image_top = gif->SavedImages[ino].ImageDesc.Top; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12989 image_left = gif->SavedImages[ino].ImageDesc.Left; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12990 image_width = gif->SavedImages[ino].ImageDesc.Width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12991 image_height = gif->SavedImages[ino].ImageDesc.Height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12992 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12993 for (y = 0; y < image_top; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12994 for (x = 0; x < width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12995 XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12996 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12997 for (y = image_top + image_height; y < height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12998 for (x = 0; x < width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12999 XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13000 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13001 for (y = image_top; y < image_top + image_height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13002 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13003 for (x = 0; x < image_left; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13004 XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13005 for (x = image_left + image_width; x < width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13006 XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13007 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13008 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13009 /* Read the GIF image into the X image. We use a local variable |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13010 `raster' here because RasterBits below is a char *, and invites |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13011 problems with bytes >= 0x80. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13012 raster = (unsigned char *) gif->SavedImages[ino].RasterBits; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13013 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13014 if (gif->SavedImages[ino].ImageDesc.Interlace) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13015 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13016 static int interlace_start[] = {0, 4, 2, 1}; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13017 static int interlace_increment[] = {8, 8, 4, 2}; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
13018 int pass; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13019 int row = interlace_start[0]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13020 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13021 pass = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13022 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13023 for (y = 0; y < image_height; y++) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13024 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13025 if (row >= image_height) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13026 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13027 row = interlace_start[++pass]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13028 while (row >= image_height) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13029 row = interlace_start[++pass]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13030 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13031 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13032 for (x = 0; x < image_width; x++) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13033 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13034 int i = raster[(y * image_width) + x]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13035 XPutPixel (ximg, x + image_left, row + image_top, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13036 pixel_colors[i]); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13037 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13038 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13039 row += interlace_increment[pass]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13040 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13041 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13042 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13043 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13044 for (y = 0; y < image_height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13045 for (x = 0; x < image_width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13046 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13047 int i = raster[y* image_width + x]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13048 XPutPixel (ximg, x + image_left, y + image_top, pixel_colors[i]); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13049 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13050 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13051 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13052 DGifCloseFile (gif); |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
13053 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
13054 /* Maybe fill in the background field while we have ximg handy. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
13055 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
13056 IMAGE_BACKGROUND (img, f, ximg); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
13057 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13058 /* Put the image into the pixmap, then free the X image and its buffer. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13059 x_put_x_image (f, ximg, img->pixmap, width, height); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13060 x_destroy_x_image (ximg); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13061 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13062 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13063 return 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13064 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13065 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13066 #endif /* HAVE_GIF != 0 */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13067 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13068 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13069 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13070 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13071 Ghostscript |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13072 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13073 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13074 Lisp_Object Qpostscript; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13075 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13076 #ifdef HAVE_GHOSTSCRIPT |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13077 static int gs_image_p P_ ((Lisp_Object object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13078 static int gs_load P_ ((struct frame *f, struct image *img)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13079 static void gs_clear_image P_ ((struct frame *f, struct image *img)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13080 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13081 /* The symbol `postscript' identifying images of this type. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13082 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13083 /* Keyword symbols. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13084 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13085 Lisp_Object QCloader, QCbounding_box, QCpt_width, QCpt_height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13086 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13087 /* Indices of image specification fields in gs_format, below. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13088 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13089 enum gs_keyword_index |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13090 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13091 GS_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13092 GS_PT_WIDTH, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13093 GS_PT_HEIGHT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13094 GS_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13095 GS_LOADER, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13096 GS_BOUNDING_BOX, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13097 GS_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13098 GS_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13099 GS_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13100 GS_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13101 GS_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
13102 GS_MASK, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
13103 GS_BACKGROUND, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13104 GS_LAST |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13105 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13106 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13107 /* Vector of image_keyword structures describing the format |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13108 of valid user-defined image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13109 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13110 static struct image_keyword gs_format[GS_LAST] = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13111 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13112 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13113 {":pt-width", IMAGE_POSITIVE_INTEGER_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13114 {":pt-height", IMAGE_POSITIVE_INTEGER_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13115 {":file", IMAGE_STRING_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13116 {":loader", IMAGE_FUNCTION_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13117 {":bounding-box", IMAGE_DONT_CHECK_VALUE_TYPE, 1}, |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
13118 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
13119 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13120 {":relief", IMAGE_INTEGER_VALUE, 0}, |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
13121 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
13122 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
13123 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
13124 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13125 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13126 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13127 /* Structure describing the image type `ghostscript'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13128 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13129 static struct image_type gs_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13130 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13131 &Qpostscript, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13132 gs_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13133 gs_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13134 gs_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13135 NULL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13136 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13137 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13138 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13139 /* Free X resources of Ghostscript image IMG which is used on frame F. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13140 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13141 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13142 gs_clear_image (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13143 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13144 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13145 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13146 /* IMG->data.ptr_val may contain a recorded colormap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13147 xfree (img->data.ptr_val); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13148 x_clear_image (f, img); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13149 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13150 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13151 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13152 /* Return non-zero if OBJECT is a valid Ghostscript image |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13153 specification. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13154 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13155 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13156 gs_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13157 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13158 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13159 struct image_keyword fmt[GS_LAST]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13160 Lisp_Object tem; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13161 int i; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13162 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13163 bcopy (gs_format, fmt, sizeof fmt); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13164 |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
13165 if (!parse_image_spec (object, fmt, GS_LAST, Qpostscript)) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13166 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13167 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13168 /* Bounding box must be a list or vector containing 4 integers. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13169 tem = fmt[GS_BOUNDING_BOX].value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13170 if (CONSP (tem)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13171 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13172 for (i = 0; i < 4; ++i, tem = XCDR (tem)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13173 if (!CONSP (tem) || !INTEGERP (XCAR (tem))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13174 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13175 if (!NILP (tem)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13176 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13177 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13178 else if (VECTORP (tem)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13179 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13180 if (XVECTOR (tem)->size != 4) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13181 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13182 for (i = 0; i < 4; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13183 if (!INTEGERP (XVECTOR (tem)->contents[i])) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13184 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13185 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13186 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13187 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13188 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13189 return 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13190 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13191 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13192 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13193 /* Load Ghostscript image IMG for use on frame F. Value is non-zero |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13194 if successful. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13195 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13196 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13197 gs_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13198 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13199 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13200 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13201 char buffer[100]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13202 Lisp_Object window_and_pixmap_id = Qnil, loader, pt_height, pt_width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13203 struct gcpro gcpro1, gcpro2; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13204 Lisp_Object frame; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13205 double in_width, in_height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13206 Lisp_Object pixel_colors = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13207 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13208 /* Compute pixel size of pixmap needed from the given size in the |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13209 image specification. Sizes in the specification are in pt. 1 pt |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13210 = 1/72 in, xdpi and ydpi are stored in the frame's X display |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13211 info. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13212 pt_width = image_spec_value (img->spec, QCpt_width, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13213 in_width = XFASTINT (pt_width) / 72.0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13214 img->width = in_width * FRAME_W32_DISPLAY_INFO (f)->resx; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13215 pt_height = image_spec_value (img->spec, QCpt_height, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13216 in_height = XFASTINT (pt_height) / 72.0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13217 img->height = in_height * FRAME_W32_DISPLAY_INFO (f)->resy; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13218 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13219 /* Create the pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13220 BLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13221 xassert (img->pixmap == 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13222 img->pixmap = XCreatePixmap (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13223 img->width, img->height, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
13224 one_w32_display_info.n_cbits); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13225 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13226 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13227 if (!img->pixmap) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13228 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13229 image_error ("Unable to create pixmap for `%s'", img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13230 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13231 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13232 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13233 /* Call the loader to fill the pixmap. It returns a process object |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13234 if successful. We do not record_unwind_protect here because |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13235 other places in redisplay like calling window scroll functions |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13236 don't either. Let the Lisp loader use `unwind-protect' instead. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13237 GCPRO2 (window_and_pixmap_id, pixel_colors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13238 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13239 sprintf (buffer, "%lu %lu", |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13240 (unsigned long) FRAME_W32_WINDOW (f), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13241 (unsigned long) img->pixmap); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13242 window_and_pixmap_id = build_string (buffer); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13243 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13244 sprintf (buffer, "%lu %lu", |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13245 FRAME_FOREGROUND_PIXEL (f), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13246 FRAME_BACKGROUND_PIXEL (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13247 pixel_colors = build_string (buffer); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13248 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13249 XSETFRAME (frame, f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13250 loader = image_spec_value (img->spec, QCloader, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13251 if (NILP (loader)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13252 loader = intern ("gs-load-image"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13253 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13254 img->data.lisp_val = call6 (loader, frame, img->spec, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13255 make_number (img->width), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13256 make_number (img->height), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13257 window_and_pixmap_id, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13258 pixel_colors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13259 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13260 return PROCESSP (img->data.lisp_val); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13261 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13262 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13263 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13264 /* Kill the Ghostscript process that was started to fill PIXMAP on |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13265 frame F. Called from XTread_socket when receiving an event |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13266 telling Emacs that Ghostscript has finished drawing. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13267 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13268 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13269 x_kill_gs_process (pixmap, f) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13270 Pixmap pixmap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13271 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13272 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13273 struct image_cache *c = FRAME_X_IMAGE_CACHE (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13274 int class, i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13275 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13276 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13277 /* Find the image containing PIXMAP. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13278 for (i = 0; i < c->used; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13279 if (c->images[i]->pixmap == pixmap) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13280 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13281 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13282 /* Should someone in between have cleared the image cache, for |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13283 instance, give up. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13284 if (i == c->used) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13285 return; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13286 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13287 /* Kill the GS process. We should have found PIXMAP in the image |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13288 cache and its image should contain a process object. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13289 img = c->images[i]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13290 xassert (PROCESSP (img->data.lisp_val)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13291 Fkill_process (img->data.lisp_val, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13292 img->data.lisp_val = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13293 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13294 /* On displays with a mutable colormap, figure out the colors |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13295 allocated for the image by looking at the pixels of an XImage for |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13296 img->pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13297 class = FRAME_W32_DISPLAY_INFO (f)->visual->class; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13298 if (class != StaticColor && class != StaticGray && class != TrueColor) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13299 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13300 XImage *ximg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13301 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13302 BLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13303 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13304 /* Try to get an XImage for img->pixmep. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13305 ximg = XGetImage (FRAME_W32_DISPLAY (f), img->pixmap, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13306 0, 0, img->width, img->height, ~0, ZPixmap); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13307 if (ximg) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13308 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13309 int x, y; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13310 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13311 /* Initialize the color table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13312 init_color_table (); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13313 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13314 /* For each pixel of the image, look its color up in the |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13315 color table. After having done so, the color table will |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13316 contain an entry for each color used by the image. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13317 for (y = 0; y < img->height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13318 for (x = 0; x < img->width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13319 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13320 unsigned long pixel = XGetPixel (ximg, x, y); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13321 lookup_pixel_color (f, pixel); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13322 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13323 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13324 /* Record colors in the image. Free color table and XImage. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13325 img->colors = colors_in_color_table (&img->ncolors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13326 free_color_table (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13327 XDestroyImage (ximg); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13328 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13329 #if 0 /* This doesn't seem to be the case. If we free the colors |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13330 here, we get a BadAccess later in x_clear_image when |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13331 freeing the colors. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13332 /* We have allocated colors once, but Ghostscript has also |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13333 allocated colors on behalf of us. So, to get the |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13334 reference counts right, free them once. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13335 if (img->ncolors) |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13336 x_free_colors (FRAME_W32_DISPLAY (f), cmap, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13337 img->colors, img->ncolors, 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13338 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13339 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13340 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13341 image_error ("Cannot get X image of `%s'; colors will not be freed", |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13342 img->spec, Qnil); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13343 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13344 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13345 } |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13346 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13347 /* Now that we have the pixmap, compute mask and transform the |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13348 image if requested. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13349 BLOCK_INPUT; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13350 postprocess_image (f, img); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13351 UNBLOCK_INPUT; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13352 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13353 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13354 #endif /* HAVE_GHOSTSCRIPT */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13355 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13356 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13357 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13358 Window properties |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13359 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13360 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13361 DEFUN ("x-change-window-property", Fx_change_window_property, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13362 Sx_change_window_property, 2, 3, 0, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13363 doc: /* Change window property PROP to VALUE on the X window of FRAME. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13364 PROP and VALUE must be strings. FRAME nil or omitted means use the |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13365 selected frame. Value is VALUE. */) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13366 (prop, value, frame) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13367 Lisp_Object frame, prop, value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13368 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
13369 #if 0 /* TODO : port window properties to W32 */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13370 struct frame *f = check_x_frame (frame); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13371 Atom prop_atom; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13372 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
13373 CHECK_STRING (prop); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
13374 CHECK_STRING (value); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13375 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13376 BLOCK_INPUT; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
13377 prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), SDATA (prop), False); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13378 XChangeProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13379 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:
46293
diff
changeset
|
13380 SDATA (value), SCHARS (value)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13381 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13382 /* Make sure the property is set when we return. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13383 XFlush (FRAME_W32_DISPLAY (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13384 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13385 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
13386 #endif /* TODO */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13387 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13388 return value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13389 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13390 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13391 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13392 DEFUN ("x-delete-window-property", Fx_delete_window_property, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13393 Sx_delete_window_property, 1, 2, 0, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13394 doc: /* Remove window property PROP from X window of FRAME. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13395 FRAME nil or omitted means use the selected frame. Value is PROP. */) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13396 (prop, frame) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13397 Lisp_Object prop, frame; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13398 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
13399 #if 0 /* TODO : port window properties to W32 */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13400 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13401 struct frame *f = check_x_frame (frame); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13402 Atom prop_atom; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13403 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
13404 CHECK_STRING (prop); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13405 BLOCK_INPUT; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
13406 prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), SDATA (prop), False); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13407 XDeleteProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), prop_atom); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13408 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13409 /* Make sure the property is removed when we return. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13410 XFlush (FRAME_W32_DISPLAY (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13411 UNBLOCK_INPUT; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
13412 #endif /* TODO */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13413 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13414 return prop; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13415 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13416 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13417 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13418 DEFUN ("x-window-property", Fx_window_property, Sx_window_property, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13419 1, 2, 0, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13420 doc: /* Value is the value of window property PROP on FRAME. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13421 If FRAME is nil or omitted, use the selected frame. Value is nil |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13422 if FRAME hasn't a property with name PROP or if PROP has no string |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13423 value. */) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13424 (prop, frame) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13425 Lisp_Object prop, frame; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13426 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
13427 #if 0 /* TODO : port window properties to W32 */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13428 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13429 struct frame *f = check_x_frame (frame); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13430 Atom prop_atom; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13431 int rc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13432 Lisp_Object prop_value = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13433 char *tmp_data = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13434 Atom actual_type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13435 int actual_format; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13436 unsigned long actual_size, bytes_remaining; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13437 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
13438 CHECK_STRING (prop); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13439 BLOCK_INPUT; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
13440 prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), SDATA (prop), False); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13441 rc = XGetWindowProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13442 prop_atom, 0, 0, False, XA_STRING, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13443 &actual_type, &actual_format, &actual_size, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13444 &bytes_remaining, (unsigned char **) &tmp_data); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13445 if (rc == Success) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13446 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13447 int size = bytes_remaining; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13448 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13449 XFree (tmp_data); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13450 tmp_data = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13451 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13452 rc = XGetWindowProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13453 prop_atom, 0, bytes_remaining, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13454 False, XA_STRING, |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13455 &actual_type, &actual_format, |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13456 &actual_size, &bytes_remaining, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13457 (unsigned char **) &tmp_data); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13458 if (rc == Success) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13459 prop_value = make_string (tmp_data, size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13460 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13461 XFree (tmp_data); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13462 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13463 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13464 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13465 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13466 return prop_value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13467 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
13468 #endif /* TODO */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13469 return Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13470 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13471 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13472 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13473 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13474 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13475 Busy cursor |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13476 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13477 |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13478 /* 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:
36080
diff
changeset
|
13479 an hourglass cursor on all frames. */ |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13480 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13481 static struct atimer *hourglass_atimer; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13482 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13483 /* Non-zero means an hourglass cursor is currently shown. */ |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13484 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13485 static int hourglass_shown_p; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13486 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13487 /* Number of seconds to wait before displaying an hourglass cursor. */ |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13488 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13489 static Lisp_Object Vhourglass_delay; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13490 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13491 /* Default number of seconds to wait before displaying an hourglass |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13492 cursor. */ |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13493 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13494 #define DEFAULT_HOURGLASS_DELAY 1 |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13495 |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13496 /* Function prototypes. */ |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13497 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13498 static void show_hourglass P_ ((struct atimer *)); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13499 static void hide_hourglass P_ ((void)); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13500 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13501 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13502 /* Cancel a currently active hourglass timer, and start a new one. */ |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13503 |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13504 void |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13505 start_hourglass () |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13506 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
13507 #if 0 /* TODO: cursor shape changes. */ |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13508 EMACS_TIME delay; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
13509 int secs, usecs = 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13510 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13511 cancel_hourglass (); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13512 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13513 if (INTEGERP (Vhourglass_delay) |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13514 && XINT (Vhourglass_delay) > 0) |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13515 secs = XFASTINT (Vhourglass_delay); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13516 else if (FLOATP (Vhourglass_delay) |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13517 && XFLOAT_DATA (Vhourglass_delay) > 0) |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
13518 { |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
13519 Lisp_Object tem; |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13520 tem = Ftruncate (Vhourglass_delay, Qnil); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
13521 secs = XFASTINT (tem); |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13522 usecs = (XFLOAT_DATA (Vhourglass_delay) - secs) * 1000000; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13523 } |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13524 else |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13525 secs = DEFAULT_HOURGLASS_DELAY; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13526 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
13527 EMACS_SET_SECS_USECS (delay, secs, usecs); |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13528 hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay, |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13529 show_hourglass, NULL); |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13530 #endif |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13531 } |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13532 |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13533 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13534 /* Cancel the hourglass cursor timer if active, hide an hourglass |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13535 cursor if shown. */ |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13536 |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13537 void |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13538 cancel_hourglass () |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13539 { |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13540 if (hourglass_atimer) |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13541 { |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13542 cancel_atimer (hourglass_atimer); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13543 hourglass_atimer = NULL; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13544 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13545 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13546 if (hourglass_shown_p) |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13547 hide_hourglass (); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13548 } |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13549 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13550 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13551 /* Timer function of hourglass_atimer. TIMER is equal to |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13552 hourglass_atimer. |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13553 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13554 Display an hourglass cursor on all frames by mapping the frames' |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13555 hourglass_window. Set the hourglass_p flag in the frames' |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13556 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:
36080
diff
changeset
|
13557 shown on the frames. */ |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13558 |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13559 static void |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13560 show_hourglass (timer) |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13561 struct atimer *timer; |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13562 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
13563 #if 0 /* TODO: cursor shape changes. */ |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13564 /* The timer implementation will cancel this timer automatically |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13565 after this function has run. Set hourglass_atimer to null |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13566 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:
36080
diff
changeset
|
13567 hourglass_atimer = NULL; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13568 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13569 if (!hourglass_shown_p) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13570 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13571 Lisp_Object rest, frame; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13572 |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13573 BLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13574 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13575 FOR_EACH_FRAME (rest, frame) |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13576 if (FRAME_W32_P (XFRAME (frame))) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13577 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13578 struct frame *f = XFRAME (frame); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13579 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13580 f->output_data.w32->hourglass_p = 1; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13581 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13582 if (!f->output_data.w32->hourglass_window) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13583 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13584 unsigned long mask = CWCursor; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13585 XSetWindowAttributes attrs; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13586 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13587 attrs.cursor = f->output_data.w32->hourglass_cursor; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13588 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13589 f->output_data.w32->hourglass_window |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13590 = XCreateWindow (FRAME_X_DISPLAY (f), |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13591 FRAME_OUTER_WINDOW (f), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13592 0, 0, 32000, 32000, 0, 0, |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13593 InputOnly, |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13594 CopyFromParent, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13595 mask, &attrs); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13596 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13597 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13598 XMapRaised (FRAME_X_DISPLAY (f), |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13599 f->output_data.w32->hourglass_window); |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13600 XFlush (FRAME_X_DISPLAY (f)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13601 } |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13602 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13603 hourglass_shown_p = 1; |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13604 UNBLOCK_INPUT; |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13605 } |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13606 #endif |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13607 } |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13608 |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13609 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13610 /* Hide the hourglass cursor on all frames, if it is currently shown. */ |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13611 |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13612 static void |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13613 hide_hourglass () |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13614 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
13615 #if 0 /* TODO: cursor shape changes. */ |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13616 if (hourglass_shown_p) |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13617 { |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13618 Lisp_Object rest, frame; |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13619 |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13620 BLOCK_INPUT; |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13621 FOR_EACH_FRAME (rest, frame) |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13622 { |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13623 struct frame *f = XFRAME (frame); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13624 |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13625 if (FRAME_W32_P (f) |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13626 /* Watch out for newly created frames. */ |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13627 && f->output_data.x->hourglass_window) |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13628 { |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13629 XUnmapWindow (FRAME_X_DISPLAY (f), |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13630 f->output_data.x->hourglass_window); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13631 /* Sync here because XTread_socket looks at the |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13632 hourglass_p flag that is reset to zero below. */ |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13633 XSync (FRAME_X_DISPLAY (f), False); |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13634 f->output_data.x->hourglass_p = 0; |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13635 } |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13636 } |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13637 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
13638 hourglass_shown_p = 0; |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13639 UNBLOCK_INPUT; |
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
13640 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13641 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13642 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13643 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13644 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13645 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13646 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13647 Tool tips |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13648 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13649 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13650 static Lisp_Object x_create_tip_frame P_ ((struct w32_display_info *, |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13651 Lisp_Object, Lisp_Object)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13652 static void compute_tip_xy P_ ((struct frame *, Lisp_Object, Lisp_Object, |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13653 Lisp_Object, int, int, int *, int *)); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13654 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13655 /* The frame of a currently visible tooltip. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13656 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13657 Lisp_Object tip_frame; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13658 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13659 /* If non-nil, a timer started that hides the last tooltip when it |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13660 fires. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13661 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13662 Lisp_Object tip_timer; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13663 Window tip_window; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13664 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13665 /* If non-nil, a vector of 3 elements containing the last args |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13666 with which x-show-tip was called. See there. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13667 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13668 Lisp_Object last_show_tip_args; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13669 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13670 /* Maximum size for tooltips; a cons (COLUMNS . ROWS). */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13671 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13672 Lisp_Object Vx_max_tooltip_size; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13673 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13674 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13675 static Lisp_Object |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13676 unwind_create_tip_frame (frame) |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13677 Lisp_Object frame; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13678 { |
34638
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
13679 Lisp_Object deleted; |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
13680 |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
13681 deleted = unwind_create_frame (frame); |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
13682 if (EQ (deleted, Qt)) |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
13683 { |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
13684 tip_window = NULL; |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
13685 tip_frame = Qnil; |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
13686 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13687 |
34638
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
13688 return deleted; |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13689 } |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13690 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13691 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13692 /* Create a frame for a tooltip on the display described by DPYINFO. |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13693 PARMS is a list of frame parameters. TEXT is the string to |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13694 display in the tip frame. Value is the frame. |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13695 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13696 Note that functions called here, esp. x_default_parameter can |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13697 signal errors, for instance when a specified color name is |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13698 undefined. We have to make sure that we're in a consistent state |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13699 when this happens. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13700 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13701 static Lisp_Object |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13702 x_create_tip_frame (dpyinfo, parms, text) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13703 struct w32_display_info *dpyinfo; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13704 Lisp_Object parms, text; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13705 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13706 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13707 Lisp_Object frame, tem; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13708 Lisp_Object name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13709 long window_prompting = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13710 int width, height; |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46272
diff
changeset
|
13711 int count = SPECPDL_INDEX (); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13712 struct gcpro gcpro1, gcpro2, gcpro3; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13713 struct kboard *kb; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13714 int face_change_count_before = face_change_count; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13715 Lisp_Object buffer; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13716 struct buffer *old_buffer; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13717 |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13718 check_w32 (); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13719 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13720 /* Use this general default value to start with until we know if |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13721 this frame has a specified name. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13722 Vx_resource_name = Vinvocation_name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13723 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13724 #ifdef MULTI_KBOARD |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13725 kb = dpyinfo->kboard; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13726 #else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13727 kb = &the_only_kboard; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13728 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13729 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13730 /* Get the name of the frame to use for resource lookup. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13731 name = w32_get_arg (parms, Qname, "name", "Name", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13732 if (!STRINGP (name) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13733 && !EQ (name, Qunbound) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13734 && !NILP (name)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13735 error ("Invalid frame name--not a string or nil"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13736 Vx_resource_name = name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13737 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13738 frame = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13739 GCPRO3 (parms, name, frame); |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
13740 /* Make a frame without minibuffer nor mode-line. */ |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
13741 f = make_frame (0); |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
13742 f->wants_modeline = 0; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13743 XSETFRAME (frame, f); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13744 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13745 buffer = Fget_buffer_create (build_string (" *tip*")); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13746 Fset_window_buffer (FRAME_ROOT_WINDOW (f), buffer); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13747 old_buffer = current_buffer; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13748 set_buffer_internal_1 (XBUFFER (buffer)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13749 current_buffer->truncate_lines = Qnil; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13750 Ferase_buffer (); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13751 Finsert (1, &text); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13752 set_buffer_internal_1 (old_buffer); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13753 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13754 FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13755 record_unwind_protect (unwind_create_tip_frame, frame); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13756 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13757 /* By setting the output method, we're essentially saying that |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13758 the frame is live, as per FRAME_LIVE_P. If we get a signal |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13759 from this point on, x_destroy_window might screw up reference |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13760 counts etc. */ |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
13761 f->output_method = output_w32; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13762 f->output_data.w32 = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13763 (struct w32_output *) xmalloc (sizeof (struct w32_output)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13764 bzero (f->output_data.w32, sizeof (struct w32_output)); |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13765 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13766 FRAME_FONTSET (f) = -1; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13767 f->icon_name = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13768 |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13769 #if 0 /* GLYPH_DEBUG TODO: image support. */ |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13770 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13771 dpyinfo_refcount = dpyinfo->reference_count; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13772 #endif /* GLYPH_DEBUG */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13773 #ifdef MULTI_KBOARD |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13774 FRAME_KBOARD (f) = kb; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13775 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13776 f->output_data.w32->parent_desc = FRAME_W32_DISPLAY_INFO (f)->root_window; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13777 f->output_data.w32->explicit_parent = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13778 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13779 /* Set the name; the functions to which we pass f expect the name to |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13780 be set. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13781 if (EQ (name, Qunbound) || NILP (name)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13782 { |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13783 f->name = build_string (dpyinfo->w32_id_name); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13784 f->explicit_name = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13785 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13786 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13787 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13788 f->name = name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13789 f->explicit_name = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13790 /* use the frame's title when getting resources for this frame. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13791 specbind (Qx_resource_name, name); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13792 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13793 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13794 /* Extract the window parameters from the supplied values |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13795 that are needed to determine window geometry. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13796 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13797 Lisp_Object font; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13798 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13799 font = w32_get_arg (parms, Qfont, "font", "Font", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13800 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13801 BLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13802 /* First, try whatever font the caller has specified. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13803 if (STRINGP (font)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13804 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13805 tem = Fquery_fontset (font, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13806 if (STRINGP (tem)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
13807 font = x_new_fontset (f, SDATA (tem)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13808 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
13809 font = x_new_font (f, SDATA (font)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13810 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13811 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13812 /* Try out a font which we hope has bold and italic variations. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13813 if (!STRINGP (font)) |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13814 font = x_new_font (f, "-*-Courier New-normal-r-*-*-*-100-*-*-c-*-iso8859-1"); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13815 if (! STRINGP (font)) |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13816 font = x_new_font (f, "-*-Courier-normal-r-*-*-13-*-*-*-c-*-iso8859-1"); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13817 /* If those didn't work, look for something which will at least work. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13818 if (! STRINGP (font)) |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13819 font = x_new_font (f, "-*-Fixedsys-normal-r-*-*-12-*-*-*-c-*-iso8859-1"); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13820 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13821 if (! STRINGP (font)) |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13822 font = build_string ("Fixedsys"); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13823 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13824 x_default_parameter (f, parms, Qfont, font, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13825 "font", "Font", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13826 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13827 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13828 x_default_parameter (f, parms, Qborder_width, make_number (2), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13829 "borderWidth", "BorderWidth", RES_TYPE_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13830 /* This defaults to 2 in order to match xterm. We recognize either |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13831 internalBorderWidth or internalBorder (which is what xterm calls |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13832 it). */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13833 if (NILP (Fassq (Qinternal_border_width, parms))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13834 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13835 Lisp_Object value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13836 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13837 value = w32_get_arg (parms, Qinternal_border_width, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13838 "internalBorder", "internalBorder", RES_TYPE_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13839 if (! EQ (value, Qunbound)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13840 parms = Fcons (Fcons (Qinternal_border_width, value), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13841 parms); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13842 } |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
13843 x_default_parameter (f, parms, Qinternal_border_width, make_number (1), |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13844 "internalBorderWidth", "internalBorderWidth", |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13845 RES_TYPE_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13846 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13847 /* Also do the stuff which must be set before the window exists. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13848 x_default_parameter (f, parms, Qforeground_color, build_string ("black"), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13849 "foreground", "Foreground", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13850 x_default_parameter (f, parms, Qbackground_color, build_string ("white"), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13851 "background", "Background", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13852 x_default_parameter (f, parms, Qmouse_color, build_string ("black"), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13853 "pointerColor", "Foreground", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13854 x_default_parameter (f, parms, Qcursor_color, build_string ("black"), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13855 "cursorColor", "Foreground", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13856 x_default_parameter (f, parms, Qborder_color, build_string ("black"), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13857 "borderColor", "BorderColor", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13858 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13859 /* Init faces before x_default_parameter is called for scroll-bar |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13860 parameters because that function calls x_set_scroll_bar_width, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13861 which calls change_frame_size, which calls Fset_window_buffer, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13862 which runs hooks, which call Fvertical_motion. At the end, we |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13863 end up in init_iterator with a null face cache, which should not |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13864 happen. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13865 init_frame_faces (f); |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13866 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13867 f->output_data.w32->dwStyle = WS_BORDER | WS_POPUP | WS_DISABLED; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13868 f->output_data.w32->parent_desc = FRAME_W32_DISPLAY_INFO (f)->root_window; |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
13869 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13870 window_prompting = x_figure_window_size (f, parms); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13871 |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
13872 /* No fringes on tip frame. */ |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
13873 f->output_data.w32->fringes_extra = 0; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
13874 f->output_data.w32->fringe_cols = 0; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
13875 f->output_data.w32->left_fringe_width = 0; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
13876 f->output_data.w32->right_fringe_width = 0; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
13877 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13878 if (window_prompting & XNegative) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13879 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13880 if (window_prompting & YNegative) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13881 f->output_data.w32->win_gravity = SouthEastGravity; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13882 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13883 f->output_data.w32->win_gravity = NorthEastGravity; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13884 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13885 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13886 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13887 if (window_prompting & YNegative) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13888 f->output_data.w32->win_gravity = SouthWestGravity; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13889 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13890 f->output_data.w32->win_gravity = NorthWestGravity; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13891 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13892 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13893 f->output_data.w32->size_hint_flags = window_prompting; |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13894 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13895 BLOCK_INPUT; |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13896 my_create_tip_window (f); |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13897 UNBLOCK_INPUT; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13898 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13899 x_make_gc (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13900 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13901 x_default_parameter (f, parms, Qauto_raise, Qnil, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13902 "autoRaise", "AutoRaiseLower", RES_TYPE_BOOLEAN); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13903 x_default_parameter (f, parms, Qauto_lower, Qnil, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13904 "autoLower", "AutoRaiseLower", RES_TYPE_BOOLEAN); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13905 x_default_parameter (f, parms, Qcursor_type, Qbox, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13906 "cursorType", "CursorType", RES_TYPE_SYMBOL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13907 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13908 /* Dimensions, especially f->height, must be done via change_frame_size. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13909 Change will not be effected unless different from the current |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13910 f->height. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13911 width = f->width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13912 height = f->height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13913 f->height = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13914 SET_FRAME_WIDTH (f, 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13915 change_frame_size (f, height, width, 1, 0, 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13916 |
47731
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47161
diff
changeset
|
13917 /* Add `tooltip' frame parameter's default value. */ |
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47161
diff
changeset
|
13918 if (NILP (Fframe_parameter (frame, intern ("tooltip")))) |
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47161
diff
changeset
|
13919 Fmodify_frame_parameters (frame, Fcons (Fcons (intern ("tooltip"), Qt), |
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47161
diff
changeset
|
13920 Qnil)); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13921 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13922 /* Set up faces after all frame parameters are known. This call |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13923 also merges in face attributes specified for new frames. |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13924 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13925 Frame parameters may be changed if .Xdefaults contains |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13926 specifications for the default font. For example, if there is an |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13927 `Emacs.default.attributeBackground: pink', the `background-color' |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13928 attribute of the frame get's set, which let's the internal border |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13929 of the tooltip frame appear in pink. Prevent this. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13930 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13931 Lisp_Object bg = Fframe_parameter (frame, Qbackground_color); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13932 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13933 /* Set tip_frame here, so that */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13934 tip_frame = frame; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13935 call1 (Qface_set_after_frame_default, frame); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13936 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13937 if (!EQ (bg, Fframe_parameter (frame, Qbackground_color))) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13938 Fmodify_frame_parameters (frame, Fcons (Fcons (Qbackground_color, bg), |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13939 Qnil)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13940 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13941 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13942 f->no_split = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13943 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13944 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13945 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13946 /* It is now ok to make the frame official even if we get an error |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13947 below. And the frame needs to be on Vframe_list or making it |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13948 visible won't work. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13949 Vframe_list = Fcons (frame, Vframe_list); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13950 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13951 /* Now that the frame is official, it counts as a reference to |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13952 its display. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13953 FRAME_W32_DISPLAY_INFO (f)->reference_count++; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13954 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13955 /* Setting attributes of faces of the tooltip frame from resources |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13956 and similar will increment face_change_count, which leads to the |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13957 clearing of all current matrices. Since this isn't necessary |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13958 here, avoid it by resetting face_change_count to the value it |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13959 had before we created the tip frame. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13960 face_change_count = face_change_count_before; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13961 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13962 /* Discard the unwind_protect. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13963 return unbind_to (count, frame); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13964 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13965 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13966 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13967 /* Compute where to display tip frame F. PARMS is the list of frame |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13968 parameters for F. DX and DY are specified offsets from the current |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13969 location of the mouse. WIDTH and HEIGHT are the width and height |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13970 of the tooltip. Return coordinates relative to the root window of |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13971 the display in *ROOT_X, and *ROOT_Y. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13972 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13973 static void |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13974 compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13975 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13976 Lisp_Object parms, dx, dy; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13977 int width, height; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13978 int *root_x, *root_y; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13979 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13980 Lisp_Object left, top; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13981 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13982 /* User-specified position? */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13983 left = Fcdr (Fassq (Qleft, parms)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13984 top = Fcdr (Fassq (Qtop, parms)); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13985 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13986 /* Move the tooltip window where the mouse pointer is. Resize and |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13987 show it. */ |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13988 if (!INTEGERP (left) || !INTEGERP (top)) |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13989 { |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13990 POINT pt; |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13991 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13992 BLOCK_INPUT; |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13993 GetCursorPos (&pt); |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13994 *root_x = pt.x; |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13995 *root_y = pt.y; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13996 UNBLOCK_INPUT; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13997 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13998 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13999 if (INTEGERP (top)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14000 *root_y = XINT (top); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14001 else if (*root_y + XINT (dy) - height < 0) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14002 *root_y -= XINT (dy); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14003 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14004 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14005 *root_y -= height; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14006 *root_y += XINT (dy); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14007 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14008 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14009 if (INTEGERP (left)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14010 *root_x = XINT (left); |
42537
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
14011 else if (*root_x + XINT (dx) + width <= FRAME_W32_DISPLAY_INFO (f)->width) |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
14012 /* It fits to the right of the pointer. */ |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
14013 *root_x += XINT (dx); |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
14014 else if (width + XINT (dx) <= *root_x) |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
14015 /* It fits to the left of the pointer. */ |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14016 *root_x -= width + XINT (dx); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14017 else |
42537
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
14018 /* Put it left justified on the screen -- it ought to fit that way. */ |
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
14019 *root_x = 0; |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14020 } |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14021 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14022 |
31110 | 14023 DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14024 doc: /* Show STRING in a \"tooltip\" window on frame FRAME. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14025 A tooltip window is a small window displaying a string. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14026 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14027 FRAME nil or omitted means use the selected frame. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14028 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14029 PARMS is an optional list of frame parameters which can be |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14030 used to change the tooltip's appearance. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14031 |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14032 Automatically hide the tooltip after TIMEOUT seconds. TIMEOUT nil |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14033 means use the default timeout of 5 seconds. |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14034 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14035 If the list of frame parameters PARAMS contains a `left' parameter, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14036 the tooltip is displayed at that x-position. Otherwise it is |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14037 displayed at the mouse position, with offset DX added (default is 5 if |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14038 DX isn't specified). Likewise for the y-position; if a `top' frame |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14039 parameter is specified, it determines the y-position of the tooltip |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14040 window, otherwise it is displayed at the mouse position, with offset |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14041 DY added (default is -10). |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14042 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14043 A tooltip's maximum size is specified by `x-max-tooltip-size'. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14044 Text larger than the specified size is clipped. */) |
31110 | 14045 (string, frame, parms, timeout, dx, dy) |
14046 Lisp_Object string, frame, parms, timeout, dx, dy; | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14047 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14048 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14049 struct window *w; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14050 int root_x, root_y; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14051 struct buffer *old_buffer; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14052 struct text_pos pos; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14053 int i, width, height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14054 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14055 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:
46272
diff
changeset
|
14056 int count = SPECPDL_INDEX (); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14057 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14058 specbind (Qinhibit_redisplay, Qt); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14059 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14060 GCPRO4 (string, parms, frame, timeout); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14061 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
14062 CHECK_STRING (string); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14063 f = check_x_frame (frame); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14064 if (NILP (timeout)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14065 timeout = make_number (5); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14066 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
14067 CHECK_NATNUM (timeout); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14068 |
31110 | 14069 if (NILP (dx)) |
14070 dx = make_number (5); | |
14071 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
14072 CHECK_NUMBER (dx); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14073 |
31110 | 14074 if (NILP (dy)) |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14075 dy = make_number (-10); |
31110 | 14076 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
14077 CHECK_NUMBER (dy); |
31110 | 14078 |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14079 if (NILP (last_show_tip_args)) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14080 last_show_tip_args = Fmake_vector (make_number (3), Qnil); |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14081 |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14082 if (!NILP (tip_frame)) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14083 { |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14084 Lisp_Object last_string = AREF (last_show_tip_args, 0); |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14085 Lisp_Object last_frame = AREF (last_show_tip_args, 1); |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14086 Lisp_Object last_parms = AREF (last_show_tip_args, 2); |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14087 |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14088 if (EQ (frame, last_frame) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14089 && !NILP (Fequal (last_string, string)) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14090 && !NILP (Fequal (last_parms, parms))) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14091 { |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14092 struct frame *f = XFRAME (tip_frame); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14093 |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14094 /* Only DX and DY have changed. */ |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14095 if (!NILP (tip_timer)) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14096 { |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14097 Lisp_Object timer = tip_timer; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14098 tip_timer = Qnil; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14099 call1 (Qcancel_timer, timer); |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14100 } |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14101 |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14102 BLOCK_INPUT; |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14103 compute_tip_xy (f, parms, dx, dy, PIXEL_WIDTH (f), |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14104 PIXEL_HEIGHT (f), &root_x, &root_y); |
43210
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
14105 |
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
14106 /* Put tooltip in topmost group and in position. */ |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14107 SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOPMOST, |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14108 root_x, root_y, 0, 0, |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14109 SWP_NOSIZE | SWP_NOACTIVATE); |
43210
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
14110 |
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
14111 /* Ensure tooltip is on top of other topmost windows (eg menus). */ |
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
14112 SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOP, |
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
14113 0, 0, 0, 0, |
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
14114 SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); |
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
14115 |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14116 UNBLOCK_INPUT; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14117 goto start_timer; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14118 } |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14119 } |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14120 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14121 /* Hide a previous tip, if any. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14122 Fx_hide_tip (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14123 |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14124 ASET (last_show_tip_args, 0, string); |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14125 ASET (last_show_tip_args, 1, frame); |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14126 ASET (last_show_tip_args, 2, parms); |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14127 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14128 /* Add default values to frame parameters. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14129 if (NILP (Fassq (Qname, parms))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14130 parms = Fcons (Fcons (Qname, build_string ("tooltip")), parms); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14131 if (NILP (Fassq (Qinternal_border_width, parms))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14132 parms = Fcons (Fcons (Qinternal_border_width, make_number (3)), parms); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14133 if (NILP (Fassq (Qborder_width, parms))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14134 parms = Fcons (Fcons (Qborder_width, make_number (1)), parms); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14135 if (NILP (Fassq (Qborder_color, parms))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14136 parms = Fcons (Fcons (Qborder_color, build_string ("lightyellow")), parms); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14137 if (NILP (Fassq (Qbackground_color, parms))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14138 parms = Fcons (Fcons (Qbackground_color, build_string ("lightyellow")), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14139 parms); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14140 |
41480
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
14141 /* Block input until the tip has been fully drawn, to avoid crashes |
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
14142 when drawing tips in menus. */ |
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
14143 BLOCK_INPUT; |
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
14144 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14145 /* Create a frame for the tooltip, and record it in the global |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14146 variable tip_frame. */ |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14147 frame = x_create_tip_frame (FRAME_W32_DISPLAY_INFO (f), parms, string); |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14148 f = XFRAME (frame); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14149 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14150 /* Set up the frame's root window. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14151 w = XWINDOW (FRAME_ROOT_WINDOW (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14152 w->left = w->top = make_number (0); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14153 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14154 if (CONSP (Vx_max_tooltip_size) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14155 && INTEGERP (XCAR (Vx_max_tooltip_size)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14156 && XINT (XCAR (Vx_max_tooltip_size)) > 0 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14157 && INTEGERP (XCDR (Vx_max_tooltip_size)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14158 && XINT (XCDR (Vx_max_tooltip_size)) > 0) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14159 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14160 w->width = XCAR (Vx_max_tooltip_size); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14161 w->height = XCDR (Vx_max_tooltip_size); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14162 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14163 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14164 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14165 w->width = make_number (80); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14166 w->height = make_number (40); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14167 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14168 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14169 f->window_width = XINT (w->width); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14170 adjust_glyphs (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14171 w->pseudo_window_p = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14172 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14173 /* Display the tooltip text in a temporary buffer. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14174 old_buffer = current_buffer; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14175 set_buffer_internal_1 (XBUFFER (XWINDOW (FRAME_ROOT_WINDOW (f))->buffer)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14176 current_buffer->truncate_lines = Qnil; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14177 clear_glyph_matrix (w->desired_matrix); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14178 clear_glyph_matrix (w->current_matrix); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14179 SET_TEXT_POS (pos, BEGV, BEGV_BYTE); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14180 try_window (FRAME_ROOT_WINDOW (f), pos); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14181 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14182 /* Compute width and height of the tooltip. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14183 width = height = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14184 for (i = 0; i < w->desired_matrix->nrows; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14185 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14186 struct glyph_row *row = &w->desired_matrix->rows[i]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14187 struct glyph *last; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14188 int row_width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14189 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14190 /* Stop at the first empty row at the end. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14191 if (!row->enabled_p || !row->displays_text_p) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14192 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14193 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14194 /* Let the row go over the full width of the frame. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14195 row->full_width_p = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14196 |
41638
aadcf676d5de
(w32_wnd_proc) <WM_MENUSELECT>: Display help directly.
Jason Rumney <jasonr@gnu.org>
parents:
41480
diff
changeset
|
14197 #ifdef TODO /* Investigate why some fonts need more width than is |
aadcf676d5de
(w32_wnd_proc) <WM_MENUSELECT>: Display help directly.
Jason Rumney <jasonr@gnu.org>
parents:
41480
diff
changeset
|
14198 calculated for some tooltips. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14199 /* There's a glyph at the end of rows that is use to place |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14200 the cursor there. Don't include the width of this glyph. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14201 if (row->used[TEXT_AREA]) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14202 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14203 last = &row->glyphs[TEXT_AREA][row->used[TEXT_AREA] - 1]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14204 row_width = row->pixel_width - last->pixel_width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14205 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14206 else |
41638
aadcf676d5de
(w32_wnd_proc) <WM_MENUSELECT>: Display help directly.
Jason Rumney <jasonr@gnu.org>
parents:
41480
diff
changeset
|
14207 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14208 row_width = row->pixel_width; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14209 |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14210 /* TODO: find why tips do not draw along baseline as instructed. */ |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14211 height += row->height; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14212 width = max (width, row_width); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14213 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14214 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14215 /* Add the frame's internal border to the width and height the X |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14216 window should have. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14217 height += 2 * FRAME_INTERNAL_BORDER_WIDTH (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14218 width += 2 * FRAME_INTERNAL_BORDER_WIDTH (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14219 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14220 /* Move the tooltip window where the mouse pointer is. Resize and |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14221 show it. */ |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14222 compute_tip_xy (f, parms, dx, dy, width, height, &root_x, &root_y); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14223 |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14224 { |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14225 /* Adjust Window size to take border into account. */ |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14226 RECT rect; |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14227 rect.left = rect.top = 0; |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14228 rect.right = width; |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14229 rect.bottom = height; |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14230 AdjustWindowRect (&rect, f->output_data.w32->dwStyle, |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14231 FRAME_EXTERNAL_MENU_BAR (f)); |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14232 |
43210
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
14233 /* Position and size tooltip, and put it in the topmost group. */ |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14234 SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOPMOST, |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14235 root_x, root_y, rect.right - rect.left, |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14236 rect.bottom - rect.top, SWP_NOACTIVATE); |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14237 |
43210
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
14238 /* Ensure tooltip is on top of other topmost windows (eg menus). */ |
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
14239 SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOP, |
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
14240 0, 0, 0, 0, |
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
14241 SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); |
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
14242 |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14243 /* Let redisplay know that we have made the frame visible already. */ |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14244 f->async_visible = 1; |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14245 |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14246 ShowWindow (FRAME_W32_WINDOW (f), SW_SHOWNOACTIVATE); |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
14247 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14248 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14249 /* Draw into the window. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14250 w->must_be_updated_p = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14251 update_single_window (w, 1); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14252 |
41480
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
14253 UNBLOCK_INPUT; |
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
14254 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14255 /* Restore original current buffer. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14256 set_buffer_internal_1 (old_buffer); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14257 windows_or_buffers_changed = old_windows_or_buffers_changed; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14258 |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14259 start_timer: |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14260 /* Let the tip disappear after timeout seconds. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14261 tip_timer = call3 (intern ("run-at-time"), timeout, Qnil, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14262 intern ("x-hide-tip")); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14263 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14264 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14265 return unbind_to (count, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14266 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14267 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14268 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14269 DEFUN ("x-hide-tip", Fx_hide_tip, Sx_hide_tip, 0, 0, 0, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14270 doc: /* Hide the current tooltip window, if there is any. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14271 Value is t if tooltip was open, nil otherwise. */) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14272 () |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14273 { |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14274 int count; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14275 Lisp_Object deleted, frame, timer; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14276 struct gcpro gcpro1, gcpro2; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14277 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14278 /* Return quickly if nothing to do. */ |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14279 if (NILP (tip_timer) && NILP (tip_frame)) |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14280 return Qnil; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14281 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14282 frame = tip_frame; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14283 timer = tip_timer; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14284 GCPRO2 (frame, timer); |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14285 tip_frame = tip_timer = deleted = Qnil; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14286 |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46272
diff
changeset
|
14287 count = SPECPDL_INDEX (); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14288 specbind (Qinhibit_redisplay, Qt); |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14289 specbind (Qinhibit_quit, Qt); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14290 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14291 if (!NILP (timer)) |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14292 call1 (Qcancel_timer, timer); |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14293 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14294 if (FRAMEP (frame)) |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14295 { |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14296 Fdelete_frame (frame, Qnil); |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14297 deleted = Qt; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14298 } |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14299 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14300 UNGCPRO; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
14301 return unbind_to (count, deleted); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14302 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14303 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14304 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14305 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14306 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14307 File selection dialog |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14308 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14309 extern Lisp_Object Qfile_name_history; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14310 |
45963
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14311 /* Callback for altering the behaviour of the Open File dialog. |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14312 Makes the Filename text field contain "Current Directory" and be |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14313 read-only when "Directories" is selected in the filter. This |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14314 allows us to work around the fact that the standard Open File |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14315 dialog does not support directories. */ |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14316 UINT CALLBACK |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14317 file_dialog_callback (hwnd, msg, wParam, lParam) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14318 HWND hwnd; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14319 UINT msg; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14320 WPARAM wParam; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14321 LPARAM lParam; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14322 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14323 if (msg == WM_NOTIFY) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14324 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14325 OFNOTIFY * notify = (OFNOTIFY *)lParam; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14326 /* Detect when the Filter dropdown is changed. */ |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14327 if (notify->hdr.code == CDN_TYPECHANGE) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14328 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14329 HWND dialog = GetParent (hwnd); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14330 HWND edit_control = GetDlgItem (dialog, FILE_NAME_TEXT_FIELD); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14331 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14332 /* Directories is in index 2. */ |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14333 if (notify->lpOFN->nFilterIndex == 2) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14334 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14335 CommDlg_OpenSave_SetControlText (dialog, FILE_NAME_TEXT_FIELD, |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14336 "Current Directory"); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14337 EnableWindow (edit_control, FALSE); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14338 } |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14339 else |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14340 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14341 CommDlg_OpenSave_SetControlText (dialog, FILE_NAME_TEXT_FIELD, |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14342 ""); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14343 EnableWindow (edit_control, TRUE); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14344 } |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14345 } |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14346 } |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14347 return 0; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14348 } |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14349 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14350 DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 4, 0, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14351 doc: /* Read file name, prompting with PROMPT in directory DIR. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14352 Use a file selection dialog. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14353 Select DEFAULT-FILENAME in the dialog's file selection box, if |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14354 specified. Ensure that file exists if MUSTMATCH is non-nil. */) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14355 (prompt, dir, default_filename, mustmatch) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14356 Lisp_Object prompt, dir, default_filename, mustmatch; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14357 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14358 struct frame *f = SELECTED_FRAME (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14359 Lisp_Object file = Qnil; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
14360 int count = SPECPDL_INDEX (); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14361 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14362 char filename[MAX_PATH + 1]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14363 char init_dir[MAX_PATH + 1]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14364 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14365 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:
40528
diff
changeset
|
14366 CHECK_STRING (prompt); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
14367 CHECK_STRING (dir); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14368 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14369 /* Create the dialog with PROMPT as title, using DIR as initial |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14370 directory and using "*" as pattern. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14371 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:
46293
diff
changeset
|
14372 strncpy (init_dir, SDATA (dir), MAX_PATH); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14373 init_dir[MAX_PATH] = '\0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14374 unixtodos_filename (init_dir); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14375 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14376 if (STRINGP (default_filename)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14377 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14378 char *file_name_only; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
14379 char *full_path_name = SDATA (default_filename); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14380 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14381 unixtodos_filename (full_path_name); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14382 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14383 file_name_only = strrchr (full_path_name, '\\'); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14384 if (!file_name_only) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14385 file_name_only = full_path_name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14386 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14387 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14388 file_name_only++; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14389 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14390 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14391 strncpy (filename, file_name_only, MAX_PATH); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14392 filename[MAX_PATH] = '\0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14393 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14394 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14395 filename[0] = '\0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14396 |
45963
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14397 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14398 OPENFILENAME file_details; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14399 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14400 /* Prevent redisplay. */ |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14401 specbind (Qinhibit_redisplay, Qt); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14402 BLOCK_INPUT; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14403 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14404 bzero (&file_details, sizeof (file_details)); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14405 file_details.lStructSize = sizeof (file_details); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14406 file_details.hwndOwner = FRAME_W32_WINDOW (f); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14407 /* Undocumented Bug in Common File Dialog: |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14408 If a filter is not specified, shell links are not resolved. */ |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14409 file_details.lpstrFilter = "All Files (*.*)\0*.*\0Directories\0*|*\0\0"; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14410 file_details.lpstrFile = filename; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14411 file_details.nMaxFile = sizeof (filename); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14412 file_details.lpstrInitialDir = init_dir; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
14413 file_details.lpstrTitle = SDATA (prompt); |
45963
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14414 file_details.Flags = (OFN_HIDEREADONLY | OFN_NOCHANGEDIR |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14415 | OFN_EXPLORER | OFN_ENABLEHOOK); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14416 if (!NILP (mustmatch)) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14417 file_details.Flags |= OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14418 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14419 file_details.lpfnHook = (LPOFNHOOKPROC) file_dialog_callback; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14420 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14421 if (GetOpenFileName (&file_details)) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14422 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14423 dostounix_filename (filename); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14424 if (file_details.nFilterIndex == 2) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14425 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14426 /* "Folder Only" selected - strip dummy file name. */ |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14427 char * last = strrchr (filename, '/'); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14428 *last = '\0'; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14429 } |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14430 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14431 file = DECODE_FILE(build_string (filename)); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14432 } |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14433 /* User cancelled the dialog without making a selection. */ |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14434 else if (!CommDlgExtendedError ()) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14435 file = Qnil; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14436 /* An error occurred, fallback on reading from the mini-buffer. */ |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14437 else |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14438 file = Fcompleting_read (prompt, intern ("read-file-name-internal"), |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14439 dir, mustmatch, dir, Qfile_name_history, |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14440 default_filename, Qnil); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14441 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14442 UNBLOCK_INPUT; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14443 file = unbind_to (count, file); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
14444 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14445 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14446 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14447 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14448 /* Make "Cancel" equivalent to C-g. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14449 if (NILP (file)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14450 Fsignal (Qquit, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14451 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14452 return unbind_to (count, file); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14453 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14454 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14455 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14456 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14457 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14458 w32 specialized functions |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14459 ***********************************************************************/ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14460 |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
14461 DEFUN ("w32-select-font", Fw32_select_font, Sw32_select_font, 0, 2, 0, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14462 doc: /* Select a font using the W32 font dialog. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14463 Returns an X font string corresponding to the selection. */) |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
14464 (frame, include_proportional) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
14465 Lisp_Object frame, include_proportional; |
13434 | 14466 { |
14467 FRAME_PTR f = check_x_frame (frame); | |
14468 CHOOSEFONT cf; | |
14469 LOGFONT lf; | |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14470 TEXTMETRIC tm; |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14471 HDC hdc; |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14472 HANDLE oldobj; |
13434 | 14473 char buf[100]; |
14474 | |
14475 bzero (&cf, sizeof (cf)); | |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14476 bzero (&lf, sizeof (lf)); |
13434 | 14477 |
14478 cf.lStructSize = sizeof (cf); | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14479 cf.hwndOwner = FRAME_W32_WINDOW (f); |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
14480 cf.Flags = CF_FORCEFONTEXIST | CF_SCREENFONTS | CF_NOVERTFONTS; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
14481 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
14482 /* Unless include_proportional is non-nil, limit the selection to |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
14483 monospaced fonts. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
14484 if (NILP (include_proportional)) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
14485 cf.Flags |= CF_FIXEDPITCHONLY; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
14486 |
13434 | 14487 cf.lpLogFont = &lf; |
14488 | |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14489 /* Initialize as much of the font details as we can from the current |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14490 default font. */ |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14491 hdc = GetDC (FRAME_W32_WINDOW (f)); |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14492 oldobj = SelectObject (hdc, FRAME_FONT (f)->hfont); |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14493 GetTextFace (hdc, LF_FACESIZE, lf.lfFaceName); |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14494 if (GetTextMetrics (hdc, &tm)) |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14495 { |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14496 lf.lfHeight = tm.tmInternalLeading - tm.tmHeight; |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14497 lf.lfWeight = tm.tmWeight; |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14498 lf.lfItalic = tm.tmItalic; |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14499 lf.lfUnderline = tm.tmUnderlined; |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14500 lf.lfStrikeOut = tm.tmStruckOut; |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14501 lf.lfCharSet = tm.tmCharSet; |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14502 cf.Flags |= CF_INITTOLOGFONTSTRUCT; |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14503 } |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14504 SelectObject (hdc, oldobj); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14505 ReleaseDC (FRAME_W32_WINDOW (f), hdc); |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
14506 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
14507 if (!ChooseFont (&cf) || !w32_to_x_font (&lf, buf, 100, NULL)) |
14353 | 14508 return Qnil; |
13434 | 14509 |
14510 return build_string (buf); | |
14511 } | |
14512 | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14513 DEFUN ("w32-send-sys-command", Fw32_send_sys_command, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14514 Sw32_send_sys_command, 1, 2, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14515 doc: /* Send frame a Windows WM_SYSCOMMAND message of type COMMAND. |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
14516 Some useful values for command are #xf030 to maximise frame (#xf020 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
14517 to minimize), #xf120 to restore frame to original size, and #xf100 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
14518 to activate the menubar for keyboard access. #xf140 activates the |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14519 screen saver if defined. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14520 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14521 If optional parameter FRAME is not specified, use selected frame. */) |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14522 (command, frame) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14523 Lisp_Object command, frame; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14524 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14525 FRAME_PTR f = check_x_frame (frame); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14526 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
14527 CHECK_NUMBER (command); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14528 |
24718
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
14529 PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, XINT (command), 0); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14530 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14531 return Qnil; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14532 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14533 |
24670 | 14534 DEFUN ("w32-shell-execute", Fw32_shell_execute, Sw32_shell_execute, 2, 4, 0, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14535 doc: /* Get Windows to perform OPERATION on DOCUMENT. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14536 This is a wrapper around the ShellExecute system function, which |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14537 invokes the application registered to handle OPERATION for DOCUMENT. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14538 OPERATION is typically \"open\", \"print\" or \"explore\" (but can be |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14539 nil for the default action), and DOCUMENT is typically the name of a |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14540 document file or URL, but can also be a program executable to run or |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14541 a directory to open in the Windows Explorer. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14542 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14543 If DOCUMENT is a program executable, PARAMETERS can be a string |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14544 containing command line parameters, but otherwise should be nil. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14545 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14546 SHOW-FLAG can be used to control whether the invoked application is hidden |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14547 or minimized. If SHOW-FLAG is nil, the application is displayed normally, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14548 otherwise it is an integer representing a ShowWindow flag: |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14549 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14550 0 - start hidden |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14551 1 - start normally |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14552 3 - start maximized |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14553 6 - start minimized */) |
24670 | 14554 (operation, document, parameters, show_flag) |
14555 Lisp_Object operation, document, parameters, show_flag; | |
14556 { | |
14557 Lisp_Object current_dir; | |
14558 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
14559 CHECK_STRING (document); |
24670 | 14560 |
14561 /* Encode filename and current directory. */ | |
14562 current_dir = ENCODE_FILE (current_buffer->directory); | |
14563 document = ENCODE_FILE (document); | |
14564 if ((int) ShellExecute (NULL, | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14565 (STRINGP (operation) ? |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
14566 SDATA (operation) : NULL), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
14567 SDATA (document), |
24670 | 14568 (STRINGP (parameters) ? |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
14569 SDATA (parameters) : NULL), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
14570 SDATA (current_dir), |
24670 | 14571 (INTEGERP (show_flag) ? |
14572 XINT (show_flag) : SW_SHOWDEFAULT)) | |
14573 > 32) | |
14574 return Qt; | |
34698
cc62e2e0949d
(Fw32_shell_execute): Use it.
Andrew Innes <andrewi@gnu.org>
parents:
34643
diff
changeset
|
14575 error ("ShellExecute failed: %s", w32_strerror (0)); |
24670 | 14576 } |
14577 | |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14578 /* Lookup virtual keycode from string representing the name of a |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14579 non-ascii keystroke into the corresponding virtual key, using |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14580 lispy_function_keys. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14581 static int |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14582 lookup_vk_code (char *key) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14583 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14584 int i; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14585 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14586 for (i = 0; i < 256; i++) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14587 if (lispy_function_keys[i] != 0 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14588 && strcmp (lispy_function_keys[i], key) == 0) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14589 return i; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14590 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14591 return -1; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14592 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14593 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14594 /* Convert a one-element vector style key sequence to a hot key |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14595 definition. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14596 static int |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14597 w32_parse_hot_key (key) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14598 Lisp_Object key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14599 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14600 /* Copied from Fdefine_key and store_in_keymap. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14601 register Lisp_Object c; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14602 int vk_code; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14603 int lisp_modifiers; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14604 int w32_modifiers; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14605 struct gcpro gcpro1; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14606 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
14607 CHECK_VECTOR (key); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14608 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14609 if (XFASTINT (Flength (key)) != 1) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14610 return Qnil; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14611 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14612 GCPRO1 (key); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14613 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14614 c = Faref (key, make_number (0)); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14615 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14616 if (CONSP (c) && lucid_event_type_list_p (c)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14617 c = Fevent_convert_list (c); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14618 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14619 UNGCPRO; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14620 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14621 if (! INTEGERP (c) && ! SYMBOLP (c)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14622 error ("Key definition is invalid"); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14623 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14624 /* Work out the base key and the modifiers. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14625 if (SYMBOLP (c)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14626 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14627 c = parse_modifiers (c); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14628 lisp_modifiers = Fcar (Fcdr (c)); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14629 c = Fcar (c); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14630 if (!SYMBOLP (c)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14631 abort (); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
14632 vk_code = lookup_vk_code (SDATA (SYMBOL_NAME (c))); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14633 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14634 else if (INTEGERP (c)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14635 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14636 lisp_modifiers = XINT (c) & ~CHARACTERBITS; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14637 /* Many ascii characters are their own virtual key code. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14638 vk_code = XINT (c) & CHARACTERBITS; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14639 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14640 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14641 if (vk_code < 0 || vk_code > 255) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14642 return Qnil; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14643 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14644 if ((lisp_modifiers & meta_modifier) != 0 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14645 && !NILP (Vw32_alt_is_meta)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14646 lisp_modifiers |= alt_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14647 |
31110 | 14648 /* Supply defs missing from mingw32. */ |
14649 #ifndef MOD_ALT | |
14650 #define MOD_ALT 0x0001 | |
14651 #define MOD_CONTROL 0x0002 | |
14652 #define MOD_SHIFT 0x0004 | |
14653 #define MOD_WIN 0x0008 | |
14654 #endif | |
14655 | |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14656 /* Convert lisp modifiers to Windows hot-key form. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14657 w32_modifiers = (lisp_modifiers & hyper_modifier) ? MOD_WIN : 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14658 w32_modifiers |= (lisp_modifiers & alt_modifier) ? MOD_ALT : 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14659 w32_modifiers |= (lisp_modifiers & ctrl_modifier) ? MOD_CONTROL : 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14660 w32_modifiers |= (lisp_modifiers & shift_modifier) ? MOD_SHIFT : 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14661 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14662 return HOTKEY (vk_code, w32_modifiers); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14663 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14664 |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14665 DEFUN ("w32-register-hot-key", Fw32_register_hot_key, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14666 Sw32_register_hot_key, 1, 1, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14667 doc: /* Register KEY as a hot-key combination. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14668 Certain key combinations like Alt-Tab are reserved for system use on |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14669 Windows, and therefore are normally intercepted by the system. However, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14670 most of these key combinations can be received by registering them as |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14671 hot-keys, overriding their special meaning. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14672 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14673 KEY must be a one element key definition in vector form that would be |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14674 acceptable to `define-key' (e.g. [A-tab] for Alt-Tab). The meta |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14675 modifier is interpreted as Alt if `w32-alt-is-meta' is t, and hyper |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14676 is always interpreted as the Windows modifier keys. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14677 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14678 The return value is the hotkey-id if registered, otherwise nil. */) |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14679 (key) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14680 Lisp_Object key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14681 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14682 key = w32_parse_hot_key (key); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14683 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14684 if (NILP (Fmemq (key, w32_grabbed_keys))) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14685 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14686 /* Reuse an empty slot if possible. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14687 Lisp_Object item = Fmemq (Qnil, w32_grabbed_keys); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14688 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14689 /* Safe to add new key to list, even if we have focus. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14690 if (NILP (item)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14691 w32_grabbed_keys = Fcons (key, w32_grabbed_keys); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14692 else |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39812
diff
changeset
|
14693 XSETCAR (item, key); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14694 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14695 /* Notify input thread about new hot-key definition, so that it |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14696 takes effect without needing to switch focus. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14697 PostThreadMessage (dwWindowsThreadId, WM_EMACS_REGISTER_HOT_KEY, |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14698 (WPARAM) key, 0); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14699 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14700 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14701 return key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14702 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14703 |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14704 DEFUN ("w32-unregister-hot-key", Fw32_unregister_hot_key, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14705 Sw32_unregister_hot_key, 1, 1, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14706 doc: /* Unregister HOTKEY as a hot-key combination. */) |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14707 (key) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14708 Lisp_Object key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14709 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14710 Lisp_Object item; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14711 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14712 if (!INTEGERP (key)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14713 key = w32_parse_hot_key (key); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14714 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14715 item = Fmemq (key, w32_grabbed_keys); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14716 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14717 if (!NILP (item)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14718 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14719 /* Notify input thread about hot-key definition being removed, so |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14720 that it takes effect without needing focus switch. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14721 if (PostThreadMessage (dwWindowsThreadId, WM_EMACS_UNREGISTER_HOT_KEY, |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14722 (WPARAM) XINT (XCAR (item)), (LPARAM) item)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14723 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14724 MSG msg; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14725 GetMessage (&msg, NULL, WM_EMACS_DONE, WM_EMACS_DONE); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14726 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14727 return Qt; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14728 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14729 return Qnil; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14730 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14731 |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14732 DEFUN ("w32-registered-hot-keys", Fw32_registered_hot_keys, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14733 Sw32_registered_hot_keys, 0, 0, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14734 doc: /* Return list of registered hot-key IDs. */) |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14735 () |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14736 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14737 return Fcopy_sequence (w32_grabbed_keys); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14738 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14739 |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14740 DEFUN ("w32-reconstruct-hot-key", Fw32_reconstruct_hot_key, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14741 Sw32_reconstruct_hot_key, 1, 1, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14742 doc: /* Convert hot-key ID to a lisp key combination. */) |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14743 (hotkeyid) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14744 Lisp_Object hotkeyid; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14745 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14746 int vk_code, w32_modifiers; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14747 Lisp_Object key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14748 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
14749 CHECK_NUMBER (hotkeyid); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14750 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14751 vk_code = HOTKEY_VK_CODE (hotkeyid); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14752 w32_modifiers = HOTKEY_MODIFIERS (hotkeyid); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14753 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14754 if (lispy_function_keys[vk_code]) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14755 key = intern (lispy_function_keys[vk_code]); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14756 else |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14757 key = make_number (vk_code); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14758 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14759 key = Fcons (key, Qnil); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14760 if (w32_modifiers & MOD_SHIFT) |
23950
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
14761 key = Fcons (Qshift, key); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14762 if (w32_modifiers & MOD_CONTROL) |
23950
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
14763 key = Fcons (Qctrl, key); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14764 if (w32_modifiers & MOD_ALT) |
23950
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
14765 key = Fcons (NILP (Vw32_alt_is_meta) ? Qalt : Qmeta, key); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14766 if (w32_modifiers & MOD_WIN) |
23950
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
14767 key = Fcons (Qhyper, key); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14768 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14769 return key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14770 } |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14771 |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14772 DEFUN ("w32-toggle-lock-key", Fw32_toggle_lock_key, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14773 Sw32_toggle_lock_key, 1, 2, 0, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14774 doc: /* Toggle the state of the lock key KEY. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14775 KEY can be `capslock', `kp-numlock', or `scroll'. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14776 If the optional parameter NEW-STATE is a number, then the state of KEY |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14777 is set to off if the low bit of NEW-STATE is zero, otherwise on. */) |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14778 (key, new_state) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14779 Lisp_Object key, new_state; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14780 { |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14781 int vk_code; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14782 |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14783 if (EQ (key, intern ("capslock"))) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14784 vk_code = VK_CAPITAL; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14785 else if (EQ (key, intern ("kp-numlock"))) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14786 vk_code = VK_NUMLOCK; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14787 else if (EQ (key, intern ("scroll"))) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14788 vk_code = VK_SCROLL; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14789 else |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14790 return Qnil; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14791 |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14792 if (!dwWindowsThreadId) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14793 return make_number (w32_console_toggle_lock_key (vk_code, new_state)); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14794 |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14795 if (PostThreadMessage (dwWindowsThreadId, WM_EMACS_TOGGLE_LOCK_KEY, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14796 (WPARAM) vk_code, (LPARAM) new_state)) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14797 { |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14798 MSG msg; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14799 GetMessage (&msg, NULL, WM_EMACS_DONE, WM_EMACS_DONE); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14800 return make_number (msg.wParam); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14801 } |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14802 return Qnil; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14803 } |
13434 | 14804 |
34643
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14805 DEFUN ("file-system-info", Ffile_system_info, Sfile_system_info, 1, 1, 0, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14806 doc: /* Return storage information about the file system FILENAME is on. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14807 Value is a list of floats (TOTAL FREE AVAIL), where TOTAL is the total |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14808 storage of the file system, FREE is the free storage, and AVAIL is the |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14809 storage available to a non-superuser. All 3 numbers are in bytes. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14810 If the underlying system call fails, value is nil. */) |
34643
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14811 (filename) |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14812 Lisp_Object filename; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14813 { |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14814 Lisp_Object encoded, value; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14815 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
14816 CHECK_STRING (filename); |
34643
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14817 filename = Fexpand_file_name (filename, Qnil); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14818 encoded = ENCODE_FILE (filename); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14819 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14820 value = Qnil; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14821 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14822 /* Determining the required information on Windows turns out, sadly, |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14823 to be more involved than one would hope. The original Win32 api |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14824 call for this will return bogus information on some systems, but we |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14825 must dynamically probe for the replacement api, since that was |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14826 added rather late on. */ |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14827 { |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14828 HMODULE hKernel = GetModuleHandle ("kernel32"); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14829 BOOL (*pfn_GetDiskFreeSpaceEx) |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14830 (char *, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER) |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14831 = (void *) GetProcAddress (hKernel, "GetDiskFreeSpaceEx"); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14832 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14833 /* On Windows, we may need to specify the root directory of the |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14834 volume holding FILENAME. */ |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14835 char rootname[MAX_PATH]; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
14836 char *name = SDATA (encoded); |
34643
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14837 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14838 /* find the root name of the volume if given */ |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14839 if (isalpha (name[0]) && name[1] == ':') |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14840 { |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14841 rootname[0] = name[0]; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14842 rootname[1] = name[1]; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14843 rootname[2] = '\\'; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14844 rootname[3] = 0; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14845 } |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14846 else if (IS_DIRECTORY_SEP (name[0]) && IS_DIRECTORY_SEP (name[1])) |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14847 { |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14848 char *str = rootname; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14849 int slashes = 4; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14850 do |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14851 { |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14852 if (IS_DIRECTORY_SEP (*name) && --slashes == 0) |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14853 break; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14854 *str++ = *name++; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14855 } |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14856 while ( *name ); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14857 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14858 *str++ = '\\'; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14859 *str = 0; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14860 } |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14861 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14862 if (pfn_GetDiskFreeSpaceEx) |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14863 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
14864 /* Unsigned large integers cannot be cast to double, so |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
14865 use signed ones instead. */ |
34643
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14866 LARGE_INTEGER availbytes; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14867 LARGE_INTEGER freebytes; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14868 LARGE_INTEGER totalbytes; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14869 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14870 if (pfn_GetDiskFreeSpaceEx(rootname, |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
14871 (ULARGE_INTEGER *)&availbytes, |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
14872 (ULARGE_INTEGER *)&totalbytes, |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
14873 (ULARGE_INTEGER *)&freebytes)) |
34643
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14874 value = list3 (make_float ((double) totalbytes.QuadPart), |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14875 make_float ((double) freebytes.QuadPart), |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14876 make_float ((double) availbytes.QuadPart)); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14877 } |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14878 else |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14879 { |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14880 DWORD sectors_per_cluster; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14881 DWORD bytes_per_sector; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14882 DWORD free_clusters; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14883 DWORD total_clusters; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14884 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14885 if (GetDiskFreeSpace(rootname, |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14886 §ors_per_cluster, |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14887 &bytes_per_sector, |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14888 &free_clusters, |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14889 &total_clusters)) |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14890 value = list3 (make_float ((double) total_clusters |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14891 * sectors_per_cluster * bytes_per_sector), |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14892 make_float ((double) free_clusters |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14893 * sectors_per_cluster * bytes_per_sector), |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14894 make_float ((double) free_clusters |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14895 * sectors_per_cluster * bytes_per_sector)); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14896 } |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14897 } |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14898 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14899 return value; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14900 } |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14901 |
41480
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
14902 /*********************************************************************** |
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
14903 Initialization |
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
14904 ***********************************************************************/ |
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
14905 |
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
14906 void |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14907 syms_of_w32fns () |
13434 | 14908 { |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
14909 HMODULE user32_lib = GetModuleHandle ("user32.dll"); |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
14910 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14911 /* This is zero if not using MS-Windows. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14912 w32_in_use = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14913 |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
14914 /* TrackMouseEvent not available in all versions of Windows, so must load |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
14915 it dynamically. Do it once, here, instead of every time it is used. */ |
48375
4d7b83cc03aa
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Ben Key <bkey1@tampabay.rr.com>
parents:
48359
diff
changeset
|
14916 track_mouse_event_fn = (TrackMouseEvent_Proc) GetProcAddress (user32_lib, "TrackMouseEvent"); |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
14917 track_mouse_window = NULL; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
14918 |
42918
9b06036a8c5e
(syms_of_w32fns): Initialize w32_visible_system_caret_hwnd.
Jason Rumney <jasonr@gnu.org>
parents:
42865
diff
changeset
|
14919 w32_visible_system_caret_hwnd = NULL; |
9b06036a8c5e
(syms_of_w32fns): Initialize w32_visible_system_caret_hwnd.
Jason Rumney <jasonr@gnu.org>
parents:
42865
diff
changeset
|
14920 |
13434 | 14921 Qauto_raise = intern ("auto-raise"); |
14922 staticpro (&Qauto_raise); | |
14923 Qauto_lower = intern ("auto-lower"); | |
14924 staticpro (&Qauto_lower); | |
14925 Qborder_color = intern ("border-color"); | |
14926 staticpro (&Qborder_color); | |
14927 Qborder_width = intern ("border-width"); | |
14928 staticpro (&Qborder_width); | |
14929 Qcursor_color = intern ("cursor-color"); | |
14930 staticpro (&Qcursor_color); | |
14931 Qcursor_type = intern ("cursor-type"); | |
14932 staticpro (&Qcursor_type); | |
14933 Qgeometry = intern ("geometry"); | |
14934 staticpro (&Qgeometry); | |
14935 Qicon_left = intern ("icon-left"); | |
14936 staticpro (&Qicon_left); | |
14937 Qicon_top = intern ("icon-top"); | |
14938 staticpro (&Qicon_top); | |
14939 Qicon_type = intern ("icon-type"); | |
14940 staticpro (&Qicon_type); | |
14941 Qicon_name = intern ("icon-name"); | |
14942 staticpro (&Qicon_name); | |
14943 Qinternal_border_width = intern ("internal-border-width"); | |
14944 staticpro (&Qinternal_border_width); | |
14945 Qleft = intern ("left"); | |
14946 staticpro (&Qleft); | |
16259
f54af1701a5f
(Qright): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16106
diff
changeset
|
14947 Qright = intern ("right"); |
f54af1701a5f
(Qright): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16106
diff
changeset
|
14948 staticpro (&Qright); |
13434 | 14949 Qmouse_color = intern ("mouse-color"); |
14950 staticpro (&Qmouse_color); | |
14951 Qnone = intern ("none"); | |
14952 staticpro (&Qnone); | |
14953 Qparent_id = intern ("parent-id"); | |
14954 staticpro (&Qparent_id); | |
14955 Qscroll_bar_width = intern ("scroll-bar-width"); | |
14956 staticpro (&Qscroll_bar_width); | |
14957 Qsuppress_icon = intern ("suppress-icon"); | |
14958 staticpro (&Qsuppress_icon); | |
14959 Qundefined_color = intern ("undefined-color"); | |
14960 staticpro (&Qundefined_color); | |
14961 Qvertical_scroll_bars = intern ("vertical-scroll-bars"); | |
14962 staticpro (&Qvertical_scroll_bars); | |
14963 Qvisibility = intern ("visibility"); | |
14964 staticpro (&Qvisibility); | |
14965 Qwindow_id = intern ("window-id"); | |
14966 staticpro (&Qwindow_id); | |
14967 Qx_frame_parameter = intern ("x-frame-parameter"); | |
14968 staticpro (&Qx_frame_parameter); | |
14969 Qx_resource_name = intern ("x-resource-name"); | |
14970 staticpro (&Qx_resource_name); | |
14971 Quser_position = intern ("user-position"); | |
14972 staticpro (&Quser_position); | |
14973 Quser_size = intern ("user-size"); | |
14974 staticpro (&Quser_size); | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14975 Qscreen_gamma = intern ("screen-gamma"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14976 staticpro (&Qscreen_gamma); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14977 Qline_spacing = intern ("line-spacing"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14978 staticpro (&Qline_spacing); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14979 Qcenter = intern ("center"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14980 staticpro (&Qcenter); |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14981 Qcancel_timer = intern ("cancel-timer"); |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
14982 staticpro (&Qcancel_timer); |
43398 | 14983 Qfullscreen = intern ("fullscreen"); |
14984 staticpro (&Qfullscreen); | |
14985 Qfullwidth = intern ("fullwidth"); | |
14986 staticpro (&Qfullwidth); | |
14987 Qfullheight = intern ("fullheight"); | |
14988 staticpro (&Qfullheight); | |
14989 Qfullboth = intern ("fullboth"); | |
14990 staticpro (&Qfullboth); | |
13434 | 14991 |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14992 Qhyper = intern ("hyper"); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14993 staticpro (&Qhyper); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14994 Qsuper = intern ("super"); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14995 staticpro (&Qsuper); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14996 Qmeta = intern ("meta"); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14997 staticpro (&Qmeta); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14998 Qalt = intern ("alt"); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14999 staticpro (&Qalt); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
15000 Qctrl = intern ("ctrl"); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
15001 staticpro (&Qctrl); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
15002 Qcontrol = intern ("control"); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
15003 staticpro (&Qcontrol); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
15004 Qshift = intern ("shift"); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
15005 staticpro (&Qshift); |
43398 | 15006 /* This is the end of symbol initialization. */ |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
15007 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15008 /* Text property `display' should be nonsticky by default. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15009 Vtext_property_default_nonsticky |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15010 = Fcons (Fcons (Qdisplay, Qt), Vtext_property_default_nonsticky); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15011 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15012 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15013 Qlaplace = intern ("laplace"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15014 staticpro (&Qlaplace); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
15015 Qemboss = intern ("emboss"); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
15016 staticpro (&Qemboss); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
15017 Qedge_detection = intern ("edge-detection"); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
15018 staticpro (&Qedge_detection); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
15019 Qheuristic = intern ("heuristic"); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
15020 staticpro (&Qheuristic); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
15021 QCmatrix = intern (":matrix"); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
15022 staticpro (&QCmatrix); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
15023 QCcolor_adjustment = intern (":color-adjustment"); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
15024 staticpro (&QCcolor_adjustment); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
15025 QCmask = intern (":mask"); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
15026 staticpro (&QCmask); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15027 |
22625
e7bd87148368
(Fx_list_fonts): Bring arglist into sync with xfns.c.
Richard M. Stallman <rms@gnu.org>
parents:
22078
diff
changeset
|
15028 Qface_set_after_frame_default = intern ("face-set-after-frame-default"); |
e7bd87148368
(Fx_list_fonts): Bring arglist into sync with xfns.c.
Richard M. Stallman <rms@gnu.org>
parents:
22078
diff
changeset
|
15029 staticpro (&Qface_set_after_frame_default); |
e7bd87148368
(Fx_list_fonts): Bring arglist into sync with xfns.c.
Richard M. Stallman <rms@gnu.org>
parents:
22078
diff
changeset
|
15030 |
13434 | 15031 Fput (Qundefined_color, Qerror_conditions, |
15032 Fcons (Qundefined_color, Fcons (Qerror, Qnil))); | |
15033 Fput (Qundefined_color, Qerror_message, | |
15034 build_string ("Undefined color")); | |
15035 | |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15036 staticpro (&w32_grabbed_keys); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15037 w32_grabbed_keys = Qnil; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15038 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15039 DEFVAR_LISP ("w32-color-map", &Vw32_color_map, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15040 doc: /* An array of color name mappings for windows. */); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15041 Vw32_color_map = Qnil; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15042 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15043 DEFVAR_LISP ("w32-pass-alt-to-system", &Vw32_pass_alt_to_system, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15044 doc: /* Non-nil if alt key presses are passed on to Windows. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15045 When non-nil, for example, alt pressed and released and then space will |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15046 open the System menu. When nil, Emacs silently swallows alt key events. */); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15047 Vw32_pass_alt_to_system = Qnil; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15048 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15049 DEFVAR_LISP ("w32-alt-is-meta", &Vw32_alt_is_meta, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15050 doc: /* Non-nil if the alt key is to be considered the same as the meta key. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15051 When nil, Emacs will translate the alt key to the Alt modifier, and not Meta. */); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15052 Vw32_alt_is_meta = Qt; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15053 |
24339
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
15054 DEFVAR_INT ("w32-quit-key", &Vw32_quit_key, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15055 doc: /* If non-zero, the virtual key code for an alternative quit key. */); |
24339
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
15056 XSETINT (Vw32_quit_key, 0); |
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
15057 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
15058 DEFVAR_LISP ("w32-pass-lwindow-to-system", |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15059 &Vw32_pass_lwindow_to_system, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15060 doc: /* Non-nil if the left \"Windows\" key is passed on to Windows. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15061 When non-nil, the Start menu is opened by tapping the key. */); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15062 Vw32_pass_lwindow_to_system = Qt; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15063 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
15064 DEFVAR_LISP ("w32-pass-rwindow-to-system", |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15065 &Vw32_pass_rwindow_to_system, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15066 doc: /* Non-nil if the right \"Windows\" key is passed on to Windows. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15067 When non-nil, the Start menu is opened by tapping the key. */); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15068 Vw32_pass_rwindow_to_system = Qt; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15069 |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
15070 DEFVAR_INT ("w32-phantom-key-code", |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
15071 &Vw32_phantom_key_code, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15072 doc: /* Virtual key code used to generate \"phantom\" key presses. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15073 Value is a number between 0 and 255. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15074 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15075 Phantom key presses are generated in order to stop the system from |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15076 acting on \"Windows\" key events when `w32-pass-lwindow-to-system' or |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15077 `w32-pass-rwindow-to-system' is nil. */); |
24718
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
15078 /* Although 255 is technically not a valid key code, it works and |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
15079 means that this hack won't interfere with any real key code. */ |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
15080 Vw32_phantom_key_code = 255; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
15081 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
15082 DEFVAR_LISP ("w32-enable-num-lock", |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15083 &Vw32_enable_num_lock, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15084 doc: /* Non-nil if Num Lock should act normally. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15085 Set to nil to see Num Lock as the key `kp-numlock'. */); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15086 Vw32_enable_num_lock = Qt; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15087 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
15088 DEFVAR_LISP ("w32-enable-caps-lock", |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15089 &Vw32_enable_caps_lock, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15090 doc: /* Non-nil if Caps Lock should act normally. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15091 Set to nil to see Caps Lock as the key `capslock'. */); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15092 Vw32_enable_caps_lock = Qt; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15093 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15094 DEFVAR_LISP ("w32-scroll-lock-modifier", |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15095 &Vw32_scroll_lock_modifier, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15096 doc: /* Modifier to use for the Scroll Lock on state. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15097 The value can be hyper, super, meta, alt, control or shift for the |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15098 respective modifier, or nil to see Scroll Lock as the key `scroll'. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15099 Any other value will cause the key to be ignored. */); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15100 Vw32_scroll_lock_modifier = Qt; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15101 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15102 DEFVAR_LISP ("w32-lwindow-modifier", |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15103 &Vw32_lwindow_modifier, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15104 doc: /* Modifier to use for the left \"Windows\" key. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15105 The value can be hyper, super, meta, alt, control or shift for the |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15106 respective modifier, or nil to appear as the key `lwindow'. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15107 Any other value will cause the key to be ignored. */); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15108 Vw32_lwindow_modifier = Qnil; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15109 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15110 DEFVAR_LISP ("w32-rwindow-modifier", |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15111 &Vw32_rwindow_modifier, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15112 doc: /* Modifier to use for the right \"Windows\" key. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15113 The value can be hyper, super, meta, alt, control or shift for the |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15114 respective modifier, or nil to appear as the key `rwindow'. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15115 Any other value will cause the key to be ignored. */); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15116 Vw32_rwindow_modifier = Qnil; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15117 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15118 DEFVAR_LISP ("w32-apps-modifier", |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15119 &Vw32_apps_modifier, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15120 doc: /* Modifier to use for the \"Apps\" key. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15121 The value can be hyper, super, meta, alt, control or shift for the |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15122 respective modifier, or nil to appear as the key `apps'. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15123 Any other value will cause the key to be ignored. */); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15124 Vw32_apps_modifier = Qnil; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15125 |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
15126 DEFVAR_BOOL ("w32-enable-synthesized-fonts", &w32_enable_synthesized_fonts, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15127 doc: /* Non-nil enables selection of artificially italicized and bold fonts. */); |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
15128 w32_enable_synthesized_fonts = 0; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15129 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15130 DEFVAR_LISP ("w32-enable-palette", &Vw32_enable_palette, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15131 doc: /* Non-nil enables Windows palette management to map colors exactly. */); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15132 Vw32_enable_palette = Qt; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15133 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15134 DEFVAR_INT ("w32-mouse-button-tolerance", |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15135 &Vw32_mouse_button_tolerance, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15136 doc: /* Analogue of double click interval for faking middle mouse events. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15137 The value is the minimum time in milliseconds that must elapse between |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15138 left/right button down events before they are considered distinct events. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15139 If both mouse buttons are depressed within this interval, a middle mouse |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15140 button down event is generated instead. */); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15141 XSETINT (Vw32_mouse_button_tolerance, GetDoubleClickTime () / 2); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15142 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15143 DEFVAR_INT ("w32-mouse-move-interval", |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15144 &Vw32_mouse_move_interval, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15145 doc: /* Minimum interval between mouse move events. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15146 The value is the minimum time in milliseconds that must elapse between |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15147 successive mouse move (or scroll bar drag) events before they are |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15148 reported as lisp events. */); |
24252
e0ae6525db58
(syms_of_w32fns): Change default value of w32-mouse-move-interval to
Andrew Innes <andrewi@gnu.org>
parents:
24214
diff
changeset
|
15149 XSETINT (Vw32_mouse_move_interval, 0); |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
15150 |
42719
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
15151 DEFVAR_BOOL ("w32-pass-extra-mouse-buttons-to-system", |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
15152 &w32_pass_extra_mouse_buttons_to_system, |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
15153 doc: /* Non-nil if the fourth and fifth mouse buttons are passed to Windows. |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
15154 Recent versions of Windows support mice with up to five buttons. |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
15155 Since most applications don't support these extra buttons, most mouse |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
15156 drivers will allow you to map them to functions at the system level. |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
15157 If this variable is non-nil, Emacs will pass them on, allowing the |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
15158 system to handle them. */); |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
15159 w32_pass_extra_mouse_buttons_to_system = 0; |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
15160 |
13434 | 15161 init_x_parm_symbols (); |
15162 | |
15163 DEFVAR_LISP ("x-bitmap-file-path", &Vx_bitmap_file_path, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15164 doc: /* List of directories to search for bitmap files for w32. */); |
13434 | 15165 Vx_bitmap_file_path = decode_env_path ((char *) 0, "PATH"); |
15166 | |
15167 DEFVAR_LISP ("x-pointer-shape", &Vx_pointer_shape, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15168 doc: /* The shape of the pointer when over text. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15169 Changing the value does not affect existing frames |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15170 unless you set the mouse color. */); |
13434 | 15171 Vx_pointer_shape = Qnil; |
15172 | |
15173 DEFVAR_LISP ("x-resource-name", &Vx_resource_name, | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15174 doc: /* The name Emacs uses to look up resources; for internal use only. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15175 `x-get-resource' uses this as the first component of the instance name |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15176 when requesting resource values. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15177 Emacs initially sets `x-resource-name' to the name under which Emacs |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15178 was invoked, or to the value specified with the `-name' or `-rn' |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15179 switches, if present. */); |
13434 | 15180 Vx_resource_name = Qnil; |
15181 | |
15182 Vx_nontext_pointer_shape = Qnil; | |
15183 | |
15184 Vx_mode_pointer_shape = Qnil; | |
15185 | |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
15186 DEFVAR_LISP ("x-hourglass-pointer-shape", &Vx_hourglass_pointer_shape, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15187 doc: /* The shape of the pointer when Emacs is busy. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15188 This variable takes effect when you create a new frame |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15189 or when you set the mouse color. */); |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
15190 Vx_hourglass_pointer_shape = Qnil; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
15191 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
15192 DEFVAR_BOOL ("display-hourglass", &display_hourglass_p, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15193 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:
36080
diff
changeset
|
15194 display_hourglass_p = 1; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
15195 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
15196 DEFVAR_LISP ("hourglass-delay", &Vhourglass_delay, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15197 doc: /* *Seconds to wait before displaying an hourglass pointer. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15198 Value must be an integer or float. */); |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
15199 Vhourglass_delay = make_number (DEFAULT_HOURGLASS_DELAY); |
27936
4c1ad68f8688
Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.
Jason Rumney <jasonr@gnu.org>
parents:
27894
diff
changeset
|
15200 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15201 DEFVAR_LISP ("x-sensitive-text-pointer-shape", |
13434 | 15202 &Vx_sensitive_text_pointer_shape, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15203 doc: /* The shape of the pointer when over mouse-sensitive text. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15204 This variable takes effect when you create a new frame |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15205 or when you set the mouse color. */); |
13434 | 15206 Vx_sensitive_text_pointer_shape = Qnil; |
15207 | |
34133
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
15208 DEFVAR_LISP ("x-window-horizontal-drag-cursor", |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
15209 &Vx_window_horizontal_drag_shape, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15210 doc: /* Pointer shape to use for indicating a window can be dragged horizontally. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15211 This variable takes effect when you create a new frame |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15212 or when you set the mouse color. */); |
34133
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
15213 Vx_window_horizontal_drag_shape = Qnil; |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
15214 |
13434 | 15215 DEFVAR_LISP ("x-cursor-fore-pixel", &Vx_cursor_fore_pixel, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15216 doc: /* A string indicating the foreground color of the cursor box. */); |
13434 | 15217 Vx_cursor_fore_pixel = Qnil; |
15218 | |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
15219 DEFVAR_LISP ("x-max-tooltip-size", &Vx_max_tooltip_size, |
41019 | 15220 doc: /* Maximum size for tooltips. |
15221 Value is a pair (COLUMNS . ROWS). Text larger than this is clipped. */); | |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
15222 Vx_max_tooltip_size = Fcons (make_number (80), make_number (40)); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
15223 |
13434 | 15224 DEFVAR_LISP ("x-no-window-manager", &Vx_no_window_manager, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15225 doc: /* Non-nil if no window manager is in use. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15226 Emacs doesn't try to figure this out; this is always nil |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15227 unless you set it to something else. */); |
13434 | 15228 /* We don't have any way to find this out, so set it to nil |
15229 and maybe the user would like to set it to t. */ | |
15230 Vx_no_window_manager = Qnil; | |
15231 | |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
15232 DEFVAR_LISP ("x-pixel-size-width-font-regexp", |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
15233 &Vx_pixel_size_width_font_regexp, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15234 doc: /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15235 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15236 Since Emacs gets width of a font matching with this regexp from |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15237 PIXEL_SIZE field of the name, font finding mechanism gets faster for |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15238 such a font. This is especially effective for such large fonts as |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15239 Chinese, Japanese, and Korean. */); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
15240 Vx_pixel_size_width_font_regexp = Qnil; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
15241 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15242 DEFVAR_LISP ("image-cache-eviction-delay", &Vimage_cache_eviction_delay, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15243 doc: /* Time after which cached images are removed from the cache. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15244 When an image has not been displayed this many seconds, remove it |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15245 from the image cache. Value must be an integer or nil with nil |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15246 meaning don't clear the cache. */); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15247 Vimage_cache_eviction_delay = make_number (30 * 60); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15248 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
15249 DEFVAR_LISP ("w32-bdf-filename-alist", |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
15250 &Vw32_bdf_filename_alist, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15251 doc: /* List of bdf fonts and their corresponding filenames. */); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
15252 Vw32_bdf_filename_alist = Qnil; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
15253 |
24481
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
15254 DEFVAR_BOOL ("w32-strict-fontnames", |
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
15255 &w32_strict_fontnames, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15256 doc: /* Non-nil means only use fonts that are exact matches for those requested. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15257 Default is nil, which allows old fontnames that are not XLFD compliant, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15258 and allows third-party CJK display to work by specifying false charset |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15259 fields to trick Emacs into translating to Big5, SJIS etc. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15260 Setting this to t will prevent wrong fonts being selected when |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15261 fontsets are automatically created. */); |
24481
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
15262 w32_strict_fontnames = 0; |
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
15263 |
24695
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
15264 DEFVAR_BOOL ("w32-strict-painting", |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
15265 &w32_strict_painting, |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15266 doc: /* Non-nil means use strict rules for repainting frames. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15267 Set this to nil to get the old behaviour for repainting; this should |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15268 only be necessary if the default setting causes problems. */); |
24695
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
15269 w32_strict_painting = 1; |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
15270 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15271 DEFVAR_LISP ("w32-charset-info-alist", |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15272 &Vw32_charset_info_alist, |
41019 | 15273 doc: /* Alist linking Emacs character sets to Windows fonts and codepages. |
15274 Each entry should be of the form: | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15275 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15276 (CHARSET_NAME . (WINDOWS_CHARSET . CODEPAGE)) |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15277 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15278 where CHARSET_NAME is a string used in font names to identify the charset, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15279 WINDOWS_CHARSET is a symbol that can be one of: |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15280 w32-charset-ansi, w32-charset-default, w32-charset-symbol, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15281 w32-charset-shiftjis, w32-charset-hangeul, w32-charset-gb2312, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15282 w32-charset-chinesebig5, |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15283 #ifdef JOHAB_CHARSET |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15284 w32-charset-johab, w32-charset-hebrew, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15285 w32-charset-arabic, w32-charset-greek, w32-charset-turkish, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15286 w32-charset-vietnamese, w32-charset-thai, w32-charset-easteurope, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15287 w32-charset-russian, w32-charset-mac, w32-charset-baltic, |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15288 #endif |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15289 #ifdef UNICODE_CHARSET |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15290 w32-charset-unicode, |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15291 #endif |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15292 or w32-charset-oem. |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15293 CODEPAGE should be an integer specifying the codepage that should be used |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15294 to display the character set, t to do no translation and output as Unicode, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15295 or nil to do no translation and output as 8 bit (or multibyte on far-east |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15296 versions of Windows) characters. */); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15297 Vw32_charset_info_alist = Qnil; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15298 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15299 staticpro (&Qw32_charset_ansi); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15300 Qw32_charset_ansi = intern ("w32-charset-ansi"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15301 staticpro (&Qw32_charset_symbol); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15302 Qw32_charset_symbol = intern ("w32-charset-symbol"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15303 staticpro (&Qw32_charset_shiftjis); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15304 Qw32_charset_shiftjis = intern ("w32-charset-shiftjis"); |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
15305 staticpro (&Qw32_charset_hangeul); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
15306 Qw32_charset_hangeul = intern ("w32-charset-hangeul"); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15307 staticpro (&Qw32_charset_chinesebig5); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15308 Qw32_charset_chinesebig5 = intern ("w32-charset-chinesebig5"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15309 staticpro (&Qw32_charset_gb2312); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15310 Qw32_charset_gb2312 = intern ("w32-charset-gb2312"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15311 staticpro (&Qw32_charset_oem); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15312 Qw32_charset_oem = intern ("w32-charset-oem"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15313 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15314 #ifdef JOHAB_CHARSET |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15315 { |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15316 static int w32_extra_charsets_defined = 1; |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15317 DEFVAR_BOOL ("w32-extra-charsets-defined", &w32_extra_charsets_defined, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15318 doc: /* Internal variable. */); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15319 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15320 staticpro (&Qw32_charset_johab); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15321 Qw32_charset_johab = intern ("w32-charset-johab"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15322 staticpro (&Qw32_charset_easteurope); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15323 Qw32_charset_easteurope = intern ("w32-charset-easteurope"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15324 staticpro (&Qw32_charset_turkish); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15325 Qw32_charset_turkish = intern ("w32-charset-turkish"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15326 staticpro (&Qw32_charset_baltic); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15327 Qw32_charset_baltic = intern ("w32-charset-baltic"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15328 staticpro (&Qw32_charset_russian); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15329 Qw32_charset_russian = intern ("w32-charset-russian"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15330 staticpro (&Qw32_charset_arabic); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15331 Qw32_charset_arabic = intern ("w32-charset-arabic"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15332 staticpro (&Qw32_charset_greek); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15333 Qw32_charset_greek = intern ("w32-charset-greek"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15334 staticpro (&Qw32_charset_hebrew); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15335 Qw32_charset_hebrew = intern ("w32-charset-hebrew"); |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
15336 staticpro (&Qw32_charset_vietnamese); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
15337 Qw32_charset_vietnamese = intern ("w32-charset-vietnamese"); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15338 staticpro (&Qw32_charset_thai); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15339 Qw32_charset_thai = intern ("w32-charset-thai"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15340 staticpro (&Qw32_charset_mac); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15341 Qw32_charset_mac = intern ("w32-charset-mac"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15342 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15343 #endif |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15344 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15345 #ifdef UNICODE_CHARSET |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15346 { |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15347 static int w32_unicode_charset_defined = 1; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15348 DEFVAR_BOOL ("w32-unicode-charset-defined", |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15349 &w32_unicode_charset_defined, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
15350 doc: /* Internal variable. */); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15351 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15352 staticpro (&Qw32_charset_unicode); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15353 Qw32_charset_unicode = intern ("w32-charset-unicode"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15354 #endif |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
15355 |
13434 | 15356 defsubr (&Sx_get_resource); |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
15357 #if 0 /* TODO: Port to W32 */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15358 defsubr (&Sx_change_window_property); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15359 defsubr (&Sx_delete_window_property); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15360 defsubr (&Sx_window_property); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15361 #endif |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
25646
diff
changeset
|
15362 defsubr (&Sxw_display_color_p); |
13434 | 15363 defsubr (&Sx_display_grayscale_p); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
25646
diff
changeset
|
15364 defsubr (&Sxw_color_defined_p); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
25646
diff
changeset
|
15365 defsubr (&Sxw_color_values); |
13434 | 15366 defsubr (&Sx_server_max_request_size); |
15367 defsubr (&Sx_server_vendor); | |
15368 defsubr (&Sx_server_version); | |
15369 defsubr (&Sx_display_pixel_width); | |
15370 defsubr (&Sx_display_pixel_height); | |
15371 defsubr (&Sx_display_mm_width); | |
15372 defsubr (&Sx_display_mm_height); | |
15373 defsubr (&Sx_display_screens); | |
15374 defsubr (&Sx_display_planes); | |
15375 defsubr (&Sx_display_color_cells); | |
15376 defsubr (&Sx_display_visual_class); | |
15377 defsubr (&Sx_display_backing_store); | |
15378 defsubr (&Sx_display_save_under); | |
15379 defsubr (&Sx_parse_geometry); | |
15380 defsubr (&Sx_create_frame); | |
15381 defsubr (&Sx_open_connection); | |
15382 defsubr (&Sx_close_connection); | |
15383 defsubr (&Sx_display_list); | |
15384 defsubr (&Sx_synchronize); | |
15385 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15386 /* W32 specific functions */ |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15387 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
15388 defsubr (&Sw32_focus_frame); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15389 defsubr (&Sw32_select_font); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15390 defsubr (&Sw32_define_rgb_color); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15391 defsubr (&Sw32_default_color_map); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15392 defsubr (&Sw32_load_color_file); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
15393 defsubr (&Sw32_send_sys_command); |
24670 | 15394 defsubr (&Sw32_shell_execute); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15395 defsubr (&Sw32_register_hot_key); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15396 defsubr (&Sw32_unregister_hot_key); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15397 defsubr (&Sw32_registered_hot_keys); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
15398 defsubr (&Sw32_reconstruct_hot_key); |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
15399 defsubr (&Sw32_toggle_lock_key); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
15400 defsubr (&Sw32_find_bdf_fonts); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
15401 |
34643
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
15402 defsubr (&Sfile_system_info); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
15403 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
15404 /* Setting callback functions for fontset handler. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
15405 get_font_info_func = w32_get_font_info; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15406 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15407 #if 0 /* This function pointer doesn't seem to be used anywhere. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15408 And the pointer assigned has the wrong type, anyway. */ |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
15409 list_fonts_func = w32_list_fonts; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15410 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15411 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
15412 load_font_func = w32_load_font; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
15413 find_ccl_program_func = w32_find_ccl_program; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
15414 query_font_func = w32_query_font; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
15415 set_frame_fontset_func = x_set_font; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
15416 check_window_system_func = check_w32; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15417 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15418 /* Images. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15419 Qxbm = intern ("xbm"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15420 staticpro (&Qxbm); |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
15421 QCconversion = intern (":conversion"); |
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
15422 staticpro (&QCconversion); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15423 QCheuristic_mask = intern (":heuristic-mask"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15424 staticpro (&QCheuristic_mask); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15425 QCcolor_symbols = intern (":color-symbols"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15426 staticpro (&QCcolor_symbols); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15427 QCascent = intern (":ascent"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15428 staticpro (&QCascent); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15429 QCmargin = intern (":margin"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15430 staticpro (&QCmargin); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15431 QCrelief = intern (":relief"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15432 staticpro (&QCrelief); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15433 Qpostscript = intern ("postscript"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15434 staticpro (&Qpostscript); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
15435 #if 0 /* TODO: These need entries at top of file. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15436 QCloader = intern (":loader"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15437 staticpro (&QCloader); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15438 QCbounding_box = intern (":bounding-box"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15439 staticpro (&QCbounding_box); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15440 QCpt_width = intern (":pt-width"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15441 staticpro (&QCpt_width); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15442 QCpt_height = intern (":pt-height"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15443 staticpro (&QCpt_height); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
15444 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15445 QCindex = intern (":index"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15446 staticpro (&QCindex); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15447 Qpbm = intern ("pbm"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15448 staticpro (&Qpbm); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15449 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15450 #if HAVE_XPM |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15451 Qxpm = intern ("xpm"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15452 staticpro (&Qxpm); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15453 #endif |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
15454 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15455 #if HAVE_JPEG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15456 Qjpeg = intern ("jpeg"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15457 staticpro (&Qjpeg); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
15458 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15459 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15460 #if HAVE_TIFF |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15461 Qtiff = intern ("tiff"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15462 staticpro (&Qtiff); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
15463 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15464 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15465 #if HAVE_GIF |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15466 Qgif = intern ("gif"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15467 staticpro (&Qgif); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15468 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15469 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15470 #if HAVE_PNG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15471 Qpng = intern ("png"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15472 staticpro (&Qpng); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15473 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15474 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15475 defsubr (&Sclear_image_cache); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
15476 defsubr (&Simage_size); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
15477 defsubr (&Simage_mask_p); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15478 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15479 #if GLYPH_DEBUG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15480 defsubr (&Simagep); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15481 defsubr (&Slookup_image); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15482 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15483 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
15484 hourglass_atimer = NULL; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
15485 hourglass_shown_p = 0; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15486 defsubr (&Sx_show_tip); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15487 defsubr (&Sx_hide_tip); |
34729
3dc60d80125f
(syms_of_w32fns): Initialize and staticpro tip_frame.
Jason Rumney <jasonr@gnu.org>
parents:
34698
diff
changeset
|
15488 tip_timer = Qnil; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15489 staticpro (&tip_timer); |
34729
3dc60d80125f
(syms_of_w32fns): Initialize and staticpro tip_frame.
Jason Rumney <jasonr@gnu.org>
parents:
34698
diff
changeset
|
15490 tip_frame = Qnil; |
3dc60d80125f
(syms_of_w32fns): Initialize and staticpro tip_frame.
Jason Rumney <jasonr@gnu.org>
parents:
34698
diff
changeset
|
15491 staticpro (&tip_frame); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15492 |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
15493 last_show_tip_args = Qnil; |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
15494 staticpro (&last_show_tip_args); |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
15495 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15496 defsubr (&Sx_file_dialog); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15497 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15498 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15499 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15500 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15501 init_xfns () |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15502 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15503 image_types = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15504 Vimage_types = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15505 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
15506 define_image_type (&pbm_type); |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
15507 define_image_type (&xbm_type); |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
15508 #if 0 /* TODO : Image support for W32 */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15509 define_image_type (&gs_type); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
15510 #endif |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
15511 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15512 #if HAVE_XPM |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15513 define_image_type (&xpm_type); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15514 #endif |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
15515 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15516 #if HAVE_JPEG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15517 define_image_type (&jpeg_type); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15518 #endif |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
15519 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15520 #if HAVE_TIFF |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15521 define_image_type (&tiff_type); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15522 #endif |
44109
b615e4daf825
[HAVE_IMAGES, HAVE_PBM]: Remove conditionals.
Jason Rumney <jasonr@gnu.org>
parents:
44097
diff
changeset
|
15523 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15524 #if HAVE_GIF |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15525 define_image_type (&gif_type); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15526 #endif |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
15527 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15528 #if HAVE_PNG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15529 define_image_type (&png_type); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
15530 #endif |
13434 | 15531 } |
15532 | |
15533 #undef abort | |
15534 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
15535 void |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
15536 w32_abort() |
13434 | 15537 { |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15538 int button; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15539 button = MessageBox (NULL, |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15540 "A fatal error has occurred!\n\n" |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15541 "Select Abort to exit, Retry to debug, Ignore to continue", |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15542 "Emacs Abort Dialog", |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15543 MB_ICONEXCLAMATION | MB_TASKMODAL |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15544 | MB_SETFOREGROUND | MB_ABORTRETRYIGNORE); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15545 switch (button) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15546 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15547 case IDRETRY: |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15548 DebugBreak (); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15549 break; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15550 case IDIGNORE: |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15551 break; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15552 case IDABORT: |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15553 default: |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15554 abort (); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15555 break; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
15556 } |
13434 | 15557 } |
15148
220145cf7546
(continuation of previous checkin)
Geoff Voelker <voelker@cs.washington.edu>
parents:
15147
diff
changeset
|
15558 |
23801
119fd94ae526
(w32_last_error): Fix cut+paste error.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23681
diff
changeset
|
15559 /* For convenience when debugging. */ |
119fd94ae526
(w32_last_error): Fix cut+paste error.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23681
diff
changeset
|
15560 int |
119fd94ae526
(w32_last_error): Fix cut+paste error.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23681
diff
changeset
|
15561 w32_last_error() |
119fd94ae526
(w32_last_error): Fix cut+paste error.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23681
diff
changeset
|
15562 { |
119fd94ae526
(w32_last_error): Fix cut+paste error.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23681
diff
changeset
|
15563 return GetLastError (); |
119fd94ae526
(w32_last_error): Fix cut+paste error.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23681
diff
changeset
|
15564 } |