Mercurial > emacs
annotate src/w32fns.c @ 53329:9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
image glyph using image's ascent.
(mode_line_string): Return image glyph as object clicked on.
Adjust y0 for image glyph using image's ascent.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sun, 28 Dec 2003 00:10:12 +0000 |
parents | 8787289602d1 |
children | 21301d0e0505 |
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 |
48888
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
58 void syms_of_w32fns (); |
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
59 void globals_of_w32fns (); |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
60 static void init_external_image_libraries (); |
48888
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
61 |
13434 | 62 extern void free_frame_menubar (); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
63 extern double atof (); |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
64 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
|
65 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
|
66 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
|
67 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
68 extern int quit_char; |
13434 | 69 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
70 extern char *lispy_function_keys[]; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
71 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
72 /* 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
|
73 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
|
74 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
|
75 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
76 int gray_bitmap_width = gray_width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
77 int gray_bitmap_height = gray_height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
78 unsigned char *gray_bitmap_bits = gray_bits; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
79 |
13434 | 80 /* 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
|
81 Lisp_Object Vw32_color_map; |
13434 | 82 |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
83 /* 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
|
84 Lisp_Object Vw32_pass_alt_to_system; |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
85 |
15459
76ff60cd2b8d
(Vwin32_alt_is_meta): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15434
diff
changeset
|
86 /* 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
|
87 to alt_modifier. */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
88 Lisp_Object Vw32_alt_is_meta; |
15459
76ff60cd2b8d
(Vwin32_alt_is_meta): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15434
diff
changeset
|
89 |
24339
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
90 /* 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
|
91 Lisp_Object Vw32_quit_key; |
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
92 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
93 /* 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
|
94 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
|
95 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
|
96 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
97 /* 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
|
98 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
|
99 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
|
100 |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
101 /* 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
|
102 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
|
103 Lisp_Object Vw32_phantom_key_code; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
104 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
105 /* 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
|
106 normal key. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
107 Lisp_Object Vw32_lwindow_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
108 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
109 /* 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
|
110 normal key. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
111 Lisp_Object Vw32_rwindow_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
112 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
113 /* 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
|
114 key. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
115 Lisp_Object Vw32_apps_modifier; |
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 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
|
118 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
|
119 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
120 /* 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
|
121 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
|
122 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
123 /* 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
|
124 Lisp_Object Vw32_scroll_lock_modifier; |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
125 |
27894
6c4ff3519d09
(w32_wnd_proc) [WM_LBUTTON_DOWN, WM_RBUTTON_DOWN, WM_LBUTTON_UP,
Jason Rumney <jasonr@gnu.org>
parents:
27516
diff
changeset
|
126 /* 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
|
127 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
|
128 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
|
129 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
130 /* Enable palette management. */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
131 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
|
132 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
133 /* 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
|
134 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
|
135 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
|
136 |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
137 /* 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
|
138 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
|
139 Lisp_Object Vw32_mouse_move_interval; |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
140 |
42719
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
141 /* 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
|
142 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
|
143 |
13434 | 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; |
49369
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
155 Lisp_Object Vx_hourglass_pointer_shape, Vx_window_horizontal_drag_shape, Vx_hand_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 | |
49369
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
161 #ifndef IDC_HAND |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
162 #define IDC_HAND MAKEINTRESOURCE(32649) |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
163 #endif |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
164 |
13434 | 165 /* 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
|
166 |
13434 | 167 Lisp_Object Vx_cursor_fore_pixel; |
168 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
169 /* 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
|
170 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
171 static int w32_in_use; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
172 |
13434 | 173 /* 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
|
174 |
13434 | 175 Lisp_Object Vx_bitmap_file_path; |
176 | |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
177 /* 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
|
178 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
179 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
|
180 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
181 /* 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
|
182 Lisp_Object Vw32_bdf_filename_alist; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
183 |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
184 /* 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
|
185 int w32_strict_fontnames; |
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
186 |
24695
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
187 /* 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
|
188 indicates there is an update region. */ |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
189 int w32_strict_painting; |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
190 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
191 /* 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
|
192 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
|
193 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
194 /* 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
|
195 #ifndef VIETNAMESE_CHARSET |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
196 #define VIETNAMESE_CHARSET 163 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
197 #endif |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
198 |
13434 | 199 Lisp_Object Qnone; |
200 Lisp_Object Qsuppress_icon; | |
201 Lisp_Object Qundefined_color; | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
202 Lisp_Object Qcenter; |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
203 Lisp_Object Qcancel_timer; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
204 Lisp_Object Qhyper; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
205 Lisp_Object Qsuper; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
206 Lisp_Object Qmeta; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
207 Lisp_Object Qalt; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
208 Lisp_Object Qctrl; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
209 Lisp_Object Qcontrol; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
210 Lisp_Object Qshift; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
211 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
212 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
|
213 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
|
214 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
|
215 Lisp_Object Qw32_charset_shiftjis; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
216 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
|
217 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
|
218 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
|
219 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
|
220 |
31110 | 221 #ifndef JOHAB_CHARSET |
222 #define JOHAB_CHARSET 130 | |
223 #endif | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
224 #ifdef JOHAB_CHARSET |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
225 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
|
226 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
|
227 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
|
228 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
|
229 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
|
230 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
|
231 Lisp_Object Qw32_charset_hebrew; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
232 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
|
233 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
|
234 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
|
235 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
|
236 #endif |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
237 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
238 #ifdef UNICODE_CHARSET |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
239 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
|
240 #endif |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
241 |
51474
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
242 /* Prefix for system colors. */ |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
243 #define SYSTEM_COLOR_PREFIX "System" |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
244 #define SYSTEM_COLOR_PREFIX_LEN (sizeof (SYSTEM_COLOR_PREFIX) - 1) |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
245 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
246 /* 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
|
247 #define LMOUSE 1 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
248 #define MMOUSE 2 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
249 #define RMOUSE 4 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
250 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
251 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
|
252 static W32Msg saved_mouse_button_msg; |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
253 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
|
254 static W32Msg saved_mouse_move_msg; |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
255 static unsigned mouse_move_timer = 0; |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
256 |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
257 /* Window that is tracking the mouse. */ |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
258 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
|
259 |
51776
6a03280c654a
(clipboard_sequence_fn): New variable.
Jason Rumney <jasonr@gnu.org>
parents:
51763
diff
changeset
|
260 typedef BOOL (WINAPI * TrackMouseEvent_Proc) |
6a03280c654a
(clipboard_sequence_fn): New variable.
Jason Rumney <jasonr@gnu.org>
parents:
51763
diff
changeset
|
261 (IN OUT LPTRACKMOUSEEVENT lpEventTrack); |
6a03280c654a
(clipboard_sequence_fn): New variable.
Jason Rumney <jasonr@gnu.org>
parents:
51763
diff
changeset
|
262 |
6a03280c654a
(clipboard_sequence_fn): New variable.
Jason Rumney <jasonr@gnu.org>
parents:
51763
diff
changeset
|
263 TrackMouseEvent_Proc track_mouse_event_fn = NULL; |
6a03280c654a
(clipboard_sequence_fn): New variable.
Jason Rumney <jasonr@gnu.org>
parents:
51763
diff
changeset
|
264 ClipboardSequence_Proc clipboard_sequence_fn = NULL; |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
265 |
21874
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
266 /* W95 mousewheel handler */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
267 unsigned int msh_mousewheel = 0; |
21874
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
268 |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
269 /* Timers */ |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
270 #define MOUSE_BUTTON_ID 1 |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
271 #define MOUSE_MOVE_ID 2 |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
272 #define MENU_FREE_ID 3 |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
273 /* 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
|
274 is received. */ |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
275 #define MENU_FREE_DELAY 1000 |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
276 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
|
277 |
13434 | 278 /* 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
|
279 |
13434 | 280 extern Lisp_Object Vwindow_system_version; |
281 | |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
282 #ifdef GLYPH_DEBUG |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
283 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
|
284 #endif |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
285 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
286 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
287 /* From w32term.c. */ |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
288 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
|
289 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
|
290 |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
291 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
|
292 |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
293 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
|
294 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
|
295 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
|
296 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
|
297 |
42918
9b06036a8c5e
(syms_of_w32fns): Initialize w32_visible_system_caret_hwnd.
Jason Rumney <jasonr@gnu.org>
parents:
42865
diff
changeset
|
298 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
|
299 |
13434 | 300 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
301 /* 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
|
302 void |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
303 check_w32 () |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
304 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
305 if (! w32_in_use) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
306 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
|
307 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
308 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
309 /* Nonzero if we can use mouse menus. |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
310 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
|
311 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
312 int |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
313 have_menus_p () |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
314 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
315 return w32_in_use; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
316 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
317 |
13434 | 318 /* 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
|
319 and checking validity for W32. */ |
13434 | 320 |
321 FRAME_PTR | |
322 check_x_frame (frame) | |
323 Lisp_Object frame; | |
324 { | |
325 FRAME_PTR f; | |
326 | |
327 if (NILP (frame)) | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
328 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
329 CHECK_LIVE_FRAME (frame); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
330 f = XFRAME (frame); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
331 if (! FRAME_W32_P (f)) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
332 error ("non-w32 frame used"); |
13434 | 333 return f; |
334 } | |
335 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
336 /* 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
|
337 nil stands for the selected frame--or, if that is not a w32 frame, |
13434 | 338 the first display on the list. */ |
339 | |
50362
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
340 struct w32_display_info * |
13434 | 341 check_x_display_info (frame) |
342 Lisp_Object frame; | |
343 { | |
344 if (NILP (frame)) | |
345 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
346 struct frame *sf = XFRAME (selected_frame); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
347 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
348 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
|
349 return FRAME_W32_DISPLAY_INFO (sf); |
13434 | 350 else |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
351 return &one_w32_display_info; |
13434 | 352 } |
353 else if (STRINGP (frame)) | |
354 return x_display_info_for_name (frame); | |
355 else | |
356 { | |
357 FRAME_PTR f; | |
358 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
359 CHECK_LIVE_FRAME (frame); |
13434 | 360 f = XFRAME (frame); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
361 if (! FRAME_W32_P (f)) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
362 error ("non-w32 frame used"); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
363 return FRAME_W32_DISPLAY_INFO (f); |
13434 | 364 } |
365 } | |
366 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
367 /* Return the Emacs frame-object corresponding to an w32 window. |
13434 | 368 It could be the frame's main window or an icon window. */ |
369 | |
370 /* This function can be called during GC, so use GC_xxx type test macros. */ | |
371 | |
372 struct frame * | |
373 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
|
374 struct w32_display_info *dpyinfo; |
13434 | 375 HWND wdesc; |
376 { | |
377 Lisp_Object tail, frame; | |
378 struct frame *f; | |
379 | |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
380 for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail)) |
13434 | 381 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
382 frame = XCAR (tail); |
13434 | 383 if (!GC_FRAMEP (frame)) |
384 continue; | |
385 f = XFRAME (frame); | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
25646
diff
changeset
|
386 if (!FRAME_W32_P (f) || FRAME_W32_DISPLAY_INFO (f) != dpyinfo) |
13434 | 387 continue; |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
388 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
|
389 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
|
390 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
391 if (FRAME_W32_WINDOW (f) == wdesc) |
13434 | 392 return f; |
393 } | |
394 return 0; | |
395 } | |
396 | |
397 | |
398 | |
399 /* Code to deal with bitmaps. Bitmaps are referenced by their bitmap | |
400 id, which is just an int that this section returns. Bitmaps are | |
401 reference counted so they can be shared among frames. | |
402 | |
403 Bitmap indices are guaranteed to be > 0, so a negative number can | |
404 be used to indicate no bitmap. | |
405 | |
406 If you use x_create_bitmap_from_data, then you must keep track of | |
407 the bitmaps yourself. That is, creating a bitmap from the same | |
408 data more than once will not be caught. */ | |
409 | |
410 | |
411 /* Functions to access the contents of a bitmap, given an id. */ | |
412 | |
413 int | |
414 x_bitmap_height (f, id) | |
415 FRAME_PTR f; | |
416 int id; | |
417 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
418 return FRAME_W32_DISPLAY_INFO (f)->bitmaps[id - 1].height; |
13434 | 419 } |
420 | |
421 int | |
422 x_bitmap_width (f, id) | |
423 FRAME_PTR f; | |
424 int id; | |
425 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
426 return FRAME_W32_DISPLAY_INFO (f)->bitmaps[id - 1].width; |
13434 | 427 } |
428 | |
429 int | |
430 x_bitmap_pixmap (f, id) | |
431 FRAME_PTR f; | |
432 int id; | |
433 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
434 return (int) FRAME_W32_DISPLAY_INFO (f)->bitmaps[id - 1].pixmap; |
13434 | 435 } |
436 | |
437 | |
438 /* Allocate a new bitmap record. Returns index of new record. */ | |
439 | |
440 static int | |
441 x_allocate_bitmap_record (f) | |
442 FRAME_PTR f; | |
443 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
444 struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); |
13434 | 445 int i; |
446 | |
447 if (dpyinfo->bitmaps == NULL) | |
448 { | |
449 dpyinfo->bitmaps_size = 10; | |
450 dpyinfo->bitmaps | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
451 = (struct w32_bitmap_record *) xmalloc (dpyinfo->bitmaps_size * sizeof (struct w32_bitmap_record)); |
13434 | 452 dpyinfo->bitmaps_last = 1; |
453 return 1; | |
454 } | |
455 | |
456 if (dpyinfo->bitmaps_last < dpyinfo->bitmaps_size) | |
457 return ++dpyinfo->bitmaps_last; | |
458 | |
459 for (i = 0; i < dpyinfo->bitmaps_size; ++i) | |
460 if (dpyinfo->bitmaps[i].refcount == 0) | |
461 return i + 1; | |
462 | |
463 dpyinfo->bitmaps_size *= 2; | |
464 dpyinfo->bitmaps | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
465 = (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
|
466 dpyinfo->bitmaps_size * sizeof (struct w32_bitmap_record)); |
13434 | 467 return ++dpyinfo->bitmaps_last; |
468 } | |
469 | |
470 /* Add one reference to the reference count of the bitmap with id ID. */ | |
471 | |
472 void | |
473 x_reference_bitmap (f, id) | |
474 FRAME_PTR f; | |
475 int id; | |
476 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
477 ++FRAME_W32_DISPLAY_INFO (f)->bitmaps[id - 1].refcount; |
13434 | 478 } |
479 | |
480 /* Create a bitmap for frame F from a HEIGHT x WIDTH array of bits at BITS. */ | |
481 | |
482 int | |
483 x_create_bitmap_from_data (f, bits, width, height) | |
484 struct frame *f; | |
485 char *bits; | |
486 unsigned int width, height; | |
487 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
488 struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); |
13434 | 489 Pixmap bitmap; |
490 int id; | |
491 | |
492 bitmap = CreateBitmap (width, height, | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
493 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
|
494 FRAME_W32_DISPLAY_INFO (XFRAME (frame))->n_cbits, |
13434 | 495 bits); |
496 | |
497 if (! bitmap) | |
498 return -1; | |
499 | |
500 id = x_allocate_bitmap_record (f); | |
501 dpyinfo->bitmaps[id - 1].pixmap = bitmap; | |
502 dpyinfo->bitmaps[id - 1].file = NULL; | |
503 dpyinfo->bitmaps[id - 1].hinst = NULL; | |
504 dpyinfo->bitmaps[id - 1].refcount = 1; | |
505 dpyinfo->bitmaps[id - 1].depth = 1; | |
506 dpyinfo->bitmaps[id - 1].height = height; | |
507 dpyinfo->bitmaps[id - 1].width = width; | |
508 | |
509 return id; | |
510 } | |
511 | |
512 /* Create bitmap from file FILE for frame F. */ | |
513 | |
514 int | |
515 x_create_bitmap_from_file (f, file) | |
516 struct frame *f; | |
517 Lisp_Object file; | |
518 { | |
519 return -1; | |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
520 #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
|
521 struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); |
13434 | 522 unsigned int width, height; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
523 HBITMAP bitmap; |
13434 | 524 int xhot, yhot, result, id; |
525 Lisp_Object found; | |
526 int fd; | |
527 char *filename; | |
528 HINSTANCE hinst; | |
529 | |
530 /* Look for an existing bitmap with the same name. */ | |
531 for (id = 0; id < dpyinfo->bitmaps_last; ++id) | |
532 { | |
533 if (dpyinfo->bitmaps[id].refcount | |
534 && 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
|
535 && !strcmp (dpyinfo->bitmaps[id].file, (char *) SDATA (file))) |
13434 | 536 { |
537 ++dpyinfo->bitmaps[id].refcount; | |
538 return id + 1; | |
539 } | |
540 } | |
541 | |
542 /* 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
|
543 fd = openp (Vx_bitmap_file_path, file, Qnil, &found, Qnil); |
13434 | 544 if (fd < 0) |
545 return -1; | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
546 emacs_close (fd); |
13434 | 547 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
548 filename = (char *) SDATA (found); |
13434 | 549 |
550 hinst = LoadLibraryEx (filename, NULL, LOAD_LIBRARY_AS_DATAFILE); | |
551 | |
552 if (hinst == NULL) | |
553 return -1; | |
554 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
555 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
556 result = XReadBitmapFile (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), |
13434 | 557 filename, &width, &height, &bitmap, &xhot, &yhot); |
558 if (result != BitmapSuccess) | |
559 return -1; | |
560 | |
561 id = x_allocate_bitmap_record (f); | |
562 dpyinfo->bitmaps[id - 1].pixmap = bitmap; | |
563 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
|
564 dpyinfo->bitmaps[id - 1].file = (char *) xmalloc (SCHARS (file) + 1); |
13434 | 565 dpyinfo->bitmaps[id - 1].depth = 1; |
566 dpyinfo->bitmaps[id - 1].height = height; | |
567 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
|
568 strcpy (dpyinfo->bitmaps[id - 1].file, SDATA (file)); |
13434 | 569 |
570 return id; | |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
571 #endif /* TODO */ |
13434 | 572 } |
573 | |
574 /* Remove reference to bitmap with id number ID. */ | |
575 | |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
576 void |
13434 | 577 x_destroy_bitmap (f, id) |
578 FRAME_PTR f; | |
579 int id; | |
580 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
581 struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); |
13434 | 582 |
583 if (id > 0) | |
584 { | |
585 --dpyinfo->bitmaps[id - 1].refcount; | |
586 if (dpyinfo->bitmaps[id - 1].refcount == 0) | |
587 { | |
588 BLOCK_INPUT; | |
589 DeleteObject (dpyinfo->bitmaps[id - 1].pixmap); | |
590 if (dpyinfo->bitmaps[id - 1].file) | |
591 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
592 xfree (dpyinfo->bitmaps[id - 1].file); |
13434 | 593 dpyinfo->bitmaps[id - 1].file = NULL; |
594 } | |
595 UNBLOCK_INPUT; | |
596 } | |
597 } | |
598 } | |
599 | |
600 /* Free all the bitmaps for the display specified by DPYINFO. */ | |
601 | |
602 static void | |
603 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
|
604 struct w32_display_info *dpyinfo; |
13434 | 605 { |
606 int i; | |
607 for (i = 0; i < dpyinfo->bitmaps_last; i++) | |
608 if (dpyinfo->bitmaps[i].refcount > 0) | |
609 { | |
610 DeleteObject (dpyinfo->bitmaps[i].pixmap); | |
611 if (dpyinfo->bitmaps[i].file) | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
612 xfree (dpyinfo->bitmaps[i].file); |
13434 | 613 } |
614 dpyinfo->bitmaps_last = 0; | |
615 } | |
616 | |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
617 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
|
618 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
|
619 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
|
620 static Lisp_Object unwind_create_tip_frame P_ ((Lisp_Object)); |
50362
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
621 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
622 /* 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
|
623 void x_set_foreground_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
|
624 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
|
625 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
|
626 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
|
627 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
|
628 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
|
629 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
|
630 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
|
631 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
|
632 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
|
633 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
|
634 void x_set_tool_bar_lines 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
|
635 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
|
636 Lisp_Object)); |
13434 | 637 |
50362
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
638 |
13434 | 639 |
640 | |
641 /* Store the screen positions of frame F into XPTR and YPTR. | |
642 These are the positions of the containing window manager window, | |
643 not Emacs's own window. */ | |
644 | |
645 void | |
646 x_real_positions (f, xptr, yptr) | |
647 FRAME_PTR f; | |
648 int *xptr, *yptr; | |
649 { | |
650 POINT pt; | |
43398 | 651 RECT rect; |
652 | |
653 GetClientRect(FRAME_W32_WINDOW(f), &rect); | |
654 AdjustWindowRect(&rect, f->output_data.w32->dwStyle, FRAME_EXTERNAL_MENU_BAR(f)); | |
655 | |
656 pt.x = rect.left; | |
657 pt.y = rect.top; | |
14353 | 658 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
659 ClientToScreen (FRAME_W32_WINDOW(f), &pt); |
13434 | 660 |
43398 | 661 /* Remember x_pixels_diff and y_pixels_diff. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
662 f->x_pixels_diff = pt.x - rect.left; |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
663 f->y_pixels_diff = pt.y - rect.top; |
43398 | 664 |
13434 | 665 *xptr = pt.x; |
666 *yptr = pt.y; | |
667 } | |
668 | |
669 | |
670 | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
671 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
|
672 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
|
673 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
|
674 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
|
675 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
|
676 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
|
677 (red, green, blue, name) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
678 Lisp_Object red, green, blue, name; |
13434 | 679 { |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
680 Lisp_Object rgb; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
681 Lisp_Object oldrgb = Qnil; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
682 Lisp_Object entry; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
683 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
684 CHECK_NUMBER (red); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
685 CHECK_NUMBER (green); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
686 CHECK_NUMBER (blue); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
687 CHECK_STRING (name); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
688 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
689 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
|
690 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
691 BLOCK_INPUT; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
692 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
693 /* 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
|
694 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
|
695 if (NILP (entry)) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
696 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
697 entry = Fcons (name, rgb); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
698 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
|
699 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
700 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
701 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
702 oldrgb = Fcdr (entry); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
703 Fsetcdr (entry, rgb); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
704 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
705 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
706 UNBLOCK_INPUT; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
707 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
708 return (oldrgb); |
13434 | 709 } |
710 | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
711 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
|
712 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
|
713 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
|
714 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
|
715 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
716 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
|
717 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
|
718 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
|
719 (filename) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
720 Lisp_Object filename; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
721 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
722 FILE *fp; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
723 Lisp_Object cmap = Qnil; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
724 Lisp_Object abspath; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
725 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
726 CHECK_STRING (filename); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
727 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
|
728 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
729 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
|
730 if (fp) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
731 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
732 char buf[512]; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
733 int red, green, blue; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
734 int num; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
735 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
736 BLOCK_INPUT; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
737 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
738 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
|
739 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
|
740 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
741 char *name = buf + num; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
742 num = strlen (name) - 1; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
743 if (name[num] == '\n') |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
744 name[num] = 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
745 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
|
746 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
|
747 cmap); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
748 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
749 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
750 fclose (fp); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
751 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
752 UNBLOCK_INPUT; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
753 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
754 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
755 return cmap; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
756 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
757 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
758 /* The default colors for the w32 color map */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
759 typedef struct colormap_t |
13434 | 760 { |
761 char *name; | |
762 COLORREF colorref; | |
763 } colormap_t; | |
764 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
765 colormap_t w32_color_map[] = |
13434 | 766 { |
14983
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
767 {"snow" , PALETTERGB (255,250,250)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
768 {"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
|
769 {"GhostWhite" , PALETTERGB (248,248,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
770 {"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
|
771 {"WhiteSmoke" , PALETTERGB (245,245,245)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
772 {"gainsboro" , PALETTERGB (220,220,220)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
773 {"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
|
774 {"FloralWhite" , PALETTERGB (255,250,240)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
775 {"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
|
776 {"OldLace" , PALETTERGB (253,245,230)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
777 {"linen" , PALETTERGB (250,240,230)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
778 {"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
|
779 {"AntiqueWhite" , PALETTERGB (250,235,215)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
780 {"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
|
781 {"PapayaWhip" , PALETTERGB (255,239,213)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
782 {"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
|
783 {"BlanchedAlmond" , PALETTERGB (255,235,205)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
784 {"bisque" , PALETTERGB (255,228,196)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
785 {"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
|
786 {"PeachPuff" , PALETTERGB (255,218,185)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
787 {"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
|
788 {"NavajoWhite" , PALETTERGB (255,222,173)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
789 {"moccasin" , PALETTERGB (255,228,181)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
790 {"cornsilk" , PALETTERGB (255,248,220)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
791 {"ivory" , PALETTERGB (255,255,240)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
792 {"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
|
793 {"LemonChiffon" , PALETTERGB (255,250,205)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
794 {"seashell" , PALETTERGB (255,245,238)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
795 {"honeydew" , PALETTERGB (240,255,240)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
796 {"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
|
797 {"MintCream" , PALETTERGB (245,255,250)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
798 {"azure" , PALETTERGB (240,255,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
799 {"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
|
800 {"AliceBlue" , PALETTERGB (240,248,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
801 {"lavender" , PALETTERGB (230,230,250)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
802 {"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
|
803 {"LavenderBlush" , PALETTERGB (255,240,245)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
804 {"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
|
805 {"MistyRose" , PALETTERGB (255,228,225)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
806 {"white" , PALETTERGB (255,255,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
807 {"black" , PALETTERGB ( 0, 0, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
808 {"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
|
809 {"DarkSlateGray" , PALETTERGB ( 47, 79, 79)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
810 {"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
|
811 {"DarkSlateGrey" , PALETTERGB ( 47, 79, 79)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
812 {"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
|
813 {"DimGray" , PALETTERGB (105,105,105)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
814 {"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
|
815 {"DimGrey" , PALETTERGB (105,105,105)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
816 {"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
|
817 {"SlateGray" , PALETTERGB (112,128,144)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
818 {"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
|
819 {"SlateGrey" , PALETTERGB (112,128,144)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
820 {"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
|
821 {"LightSlateGray" , PALETTERGB (119,136,153)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
822 {"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
|
823 {"LightSlateGrey" , PALETTERGB (119,136,153)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
824 {"gray" , PALETTERGB (190,190,190)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
825 {"grey" , PALETTERGB (190,190,190)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
826 {"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
|
827 {"LightGrey" , PALETTERGB (211,211,211)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
828 {"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
|
829 {"LightGray" , PALETTERGB (211,211,211)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
830 {"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
|
831 {"MidnightBlue" , PALETTERGB ( 25, 25,112)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
832 {"navy" , PALETTERGB ( 0, 0,128)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
833 {"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
|
834 {"NavyBlue" , PALETTERGB ( 0, 0,128)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
835 {"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
|
836 {"CornflowerBlue" , PALETTERGB (100,149,237)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
837 {"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
|
838 {"DarkSlateBlue" , PALETTERGB ( 72, 61,139)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
839 {"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
|
840 {"SlateBlue" , PALETTERGB (106, 90,205)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
841 {"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
|
842 {"MediumSlateBlue" , PALETTERGB (123,104,238)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
843 {"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
|
844 {"LightSlateBlue" , PALETTERGB (132,112,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
845 {"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
|
846 {"MediumBlue" , PALETTERGB ( 0, 0,205)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
847 {"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
|
848 {"RoyalBlue" , PALETTERGB ( 65,105,225)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
849 {"blue" , PALETTERGB ( 0, 0,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
850 {"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
|
851 {"DodgerBlue" , PALETTERGB ( 30,144,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
852 {"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
|
853 {"DeepSkyBlue" , PALETTERGB ( 0,191,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
854 {"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
|
855 {"SkyBlue" , PALETTERGB (135,206,235)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
856 {"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
|
857 {"LightSkyBlue" , PALETTERGB (135,206,250)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
858 {"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
|
859 {"SteelBlue" , PALETTERGB ( 70,130,180)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
860 {"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
|
861 {"LightSteelBlue" , PALETTERGB (176,196,222)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
862 {"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
|
863 {"LightBlue" , PALETTERGB (173,216,230)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
864 {"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
|
865 {"PowderBlue" , PALETTERGB (176,224,230)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
866 {"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
|
867 {"PaleTurquoise" , PALETTERGB (175,238,238)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
868 {"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
|
869 {"DarkTurquoise" , PALETTERGB ( 0,206,209)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
870 {"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
|
871 {"MediumTurquoise" , PALETTERGB ( 72,209,204)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
872 {"turquoise" , PALETTERGB ( 64,224,208)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
873 {"cyan" , PALETTERGB ( 0,255,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
874 {"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
|
875 {"LightCyan" , PALETTERGB (224,255,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
876 {"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
|
877 {"CadetBlue" , PALETTERGB ( 95,158,160)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
878 {"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
|
879 {"MediumAquamarine" , PALETTERGB (102,205,170)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
880 {"aquamarine" , PALETTERGB (127,255,212)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
881 {"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
|
882 {"DarkGreen" , PALETTERGB ( 0,100, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
883 {"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
|
884 {"DarkOliveGreen" , PALETTERGB ( 85,107, 47)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
885 {"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
|
886 {"DarkSeaGreen" , PALETTERGB (143,188,143)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
887 {"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
|
888 {"SeaGreen" , PALETTERGB ( 46,139, 87)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
889 {"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
|
890 {"MediumSeaGreen" , PALETTERGB ( 60,179,113)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
891 {"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
|
892 {"LightSeaGreen" , PALETTERGB ( 32,178,170)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
893 {"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
|
894 {"PaleGreen" , PALETTERGB (152,251,152)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
895 {"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
|
896 {"SpringGreen" , PALETTERGB ( 0,255,127)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
897 {"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
|
898 {"LawnGreen" , PALETTERGB (124,252, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
899 {"green" , PALETTERGB ( 0,255, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
900 {"chartreuse" , PALETTERGB (127,255, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
901 {"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
|
902 {"MediumSpringGreen" , PALETTERGB ( 0,250,154)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
903 {"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
|
904 {"GreenYellow" , PALETTERGB (173,255, 47)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
905 {"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
|
906 {"LimeGreen" , PALETTERGB ( 50,205, 50)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
907 {"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
|
908 {"YellowGreen" , PALETTERGB (154,205, 50)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
909 {"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
|
910 {"ForestGreen" , PALETTERGB ( 34,139, 34)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
911 {"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
|
912 {"OliveDrab" , PALETTERGB (107,142, 35)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
913 {"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
|
914 {"DarkKhaki" , PALETTERGB (189,183,107)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
915 {"khaki" , PALETTERGB (240,230,140)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
916 {"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
|
917 {"PaleGoldenrod" , PALETTERGB (238,232,170)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
918 {"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
|
919 {"LightGoldenrodYellow" , PALETTERGB (250,250,210)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
920 {"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
|
921 {"LightYellow" , PALETTERGB (255,255,224)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
922 {"yellow" , PALETTERGB (255,255, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
923 {"gold" , PALETTERGB (255,215, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
924 {"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
|
925 {"LightGoldenrod" , PALETTERGB (238,221,130)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
926 {"goldenrod" , PALETTERGB (218,165, 32)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
927 {"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
|
928 {"DarkGoldenrod" , PALETTERGB (184,134, 11)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
929 {"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
|
930 {"RosyBrown" , PALETTERGB (188,143,143)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
931 {"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
|
932 {"IndianRed" , PALETTERGB (205, 92, 92)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
933 {"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
|
934 {"SaddleBrown" , PALETTERGB (139, 69, 19)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
935 {"sienna" , PALETTERGB (160, 82, 45)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
936 {"peru" , PALETTERGB (205,133, 63)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
937 {"burlywood" , PALETTERGB (222,184,135)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
938 {"beige" , PALETTERGB (245,245,220)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
939 {"wheat" , PALETTERGB (245,222,179)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
940 {"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
|
941 {"SandyBrown" , PALETTERGB (244,164, 96)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
942 {"tan" , PALETTERGB (210,180,140)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
943 {"chocolate" , PALETTERGB (210,105, 30)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
944 {"firebrick" , PALETTERGB (178,34, 34)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
945 {"brown" , PALETTERGB (165,42, 42)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
946 {"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
|
947 {"DarkSalmon" , PALETTERGB (233,150,122)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
948 {"salmon" , PALETTERGB (250,128,114)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
949 {"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
|
950 {"LightSalmon" , PALETTERGB (255,160,122)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
951 {"orange" , PALETTERGB (255,165, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
952 {"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
|
953 {"DarkOrange" , PALETTERGB (255,140, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
954 {"coral" , PALETTERGB (255,127, 80)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
955 {"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
|
956 {"LightCoral" , PALETTERGB (240,128,128)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
957 {"tomato" , PALETTERGB (255, 99, 71)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
958 {"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
|
959 {"OrangeRed" , PALETTERGB (255, 69, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
960 {"red" , PALETTERGB (255, 0, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
961 {"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
|
962 {"HotPink" , PALETTERGB (255,105,180)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
963 {"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
|
964 {"DeepPink" , PALETTERGB (255, 20,147)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
965 {"pink" , PALETTERGB (255,192,203)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
966 {"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
|
967 {"LightPink" , PALETTERGB (255,182,193)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
968 {"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
|
969 {"PaleVioletRed" , PALETTERGB (219,112,147)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
970 {"maroon" , PALETTERGB (176, 48, 96)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
971 {"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
|
972 {"MediumVioletRed" , PALETTERGB (199, 21,133)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
973 {"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
|
974 {"VioletRed" , PALETTERGB (208, 32,144)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
975 {"magenta" , PALETTERGB (255, 0,255)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
976 {"violet" , PALETTERGB (238,130,238)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
977 {"plum" , PALETTERGB (221,160,221)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
978 {"orchid" , PALETTERGB (218,112,214)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
979 {"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
|
980 {"MediumOrchid" , PALETTERGB (186, 85,211)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
981 {"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
|
982 {"DarkOrchid" , PALETTERGB (153, 50,204)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
983 {"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
|
984 {"DarkViolet" , PALETTERGB (148, 0,211)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
985 {"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
|
986 {"BlueViolet" , PALETTERGB (138, 43,226)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
987 {"purple" , PALETTERGB (160, 32,240)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
988 {"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
|
989 {"MediumPurple" , PALETTERGB (147,112,219)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
990 {"thistle" , PALETTERGB (216,191,216)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
991 {"gray0" , PALETTERGB ( 0, 0, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
992 {"grey0" , PALETTERGB ( 0, 0, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
993 {"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
|
994 {"DarkGrey" , PALETTERGB (169,169,169)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
995 {"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
|
996 {"DarkGray" , PALETTERGB (169,169,169)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
997 {"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
|
998 {"DarkBlue" , PALETTERGB ( 0, 0,139)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
999 {"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
|
1000 {"DarkCyan" , PALETTERGB ( 0,139,139)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1001 {"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
|
1002 {"DarkMagenta" , PALETTERGB (139, 0,139)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1003 {"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
|
1004 {"DarkRed" , PALETTERGB (139, 0, 0)}, |
88b23d545848
(win32_color_map): Use PALETTERGB instead of RGB.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14810
diff
changeset
|
1005 {"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
|
1006 {"LightGreen" , PALETTERGB (144,238,144)}, |
13434 | 1007 }; |
1008 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1009 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
|
1010 0, 0, 0, doc: /* Return the default color map. */) |
13434 | 1011 () |
1012 { | |
1013 int i; | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1014 colormap_t *pc = w32_color_map; |
13434 | 1015 Lisp_Object cmap; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1016 |
13434 | 1017 BLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1018 |
13434 | 1019 cmap = Qnil; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1020 |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1021 for (i = 0; i < sizeof (w32_color_map) / sizeof (w32_color_map[0]); |
13434 | 1022 pc++, i++) |
1023 cmap = Fcons (Fcons (build_string (pc->name), | |
1024 make_number (pc->colorref)), | |
1025 cmap); | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1026 |
13434 | 1027 UNBLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1028 |
13434 | 1029 return (cmap); |
1030 } | |
1031 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1032 Lisp_Object |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1033 w32_to_x_color (rgb) |
13434 | 1034 Lisp_Object rgb; |
1035 { | |
1036 Lisp_Object color; | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1037 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1038 CHECK_NUMBER (rgb); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1039 |
13434 | 1040 BLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1041 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1042 color = Frassq (rgb, Vw32_color_map); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1043 |
13434 | 1044 UNBLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1045 |
13434 | 1046 if (!NILP (color)) |
1047 return (Fcar (color)); | |
1048 else | |
1049 return Qnil; | |
1050 } | |
1051 | |
23314
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1052 COLORREF |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1053 w32_color_map_lookup (colorname) |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1054 char *colorname; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1055 { |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1056 Lisp_Object tail, ret = Qnil; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1057 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1058 BLOCK_INPUT; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1059 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1060 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
|
1061 { |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1062 register Lisp_Object elt, tem; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1063 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1064 elt = Fcar (tail); |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1065 if (!CONSP (elt)) continue; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1066 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1067 tem = Fcar (elt); |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1068 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1069 if (lstrcmpi (SDATA (tem), colorname) == 0) |
23314
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1070 { |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1071 ret = XUINT (Fcdr (elt)); |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1072 break; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1073 } |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1074 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1075 QUIT; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1076 } |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1077 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1078 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1079 UNBLOCK_INPUT; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1080 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1081 return ret; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1082 } |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1083 |
51474
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1084 |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1085 static void |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1086 add_system_logical_colors_to_map (system_colors) |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1087 Lisp_Object *system_colors; |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1088 { |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1089 HKEY colors_key; |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1090 |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1091 /* Other registry operations are done with input blocked. */ |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1092 BLOCK_INPUT; |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1093 |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1094 /* Look for "Control Panel/Colors" under User and Machine registry |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1095 settings. */ |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1096 if (RegOpenKeyEx (HKEY_CURRENT_USER, "Control Panel\\Colors", 0, |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1097 KEY_READ, &colors_key) == ERROR_SUCCESS |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1098 || RegOpenKeyEx (HKEY_LOCAL_MACHINE, "Control Panel\\Colors", 0, |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1099 KEY_READ, &colors_key) == ERROR_SUCCESS) |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1100 { |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1101 /* List all keys. */ |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1102 char color_buffer[64]; |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1103 char full_name_buffer[MAX_PATH + SYSTEM_COLOR_PREFIX_LEN]; |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1104 int index = 0; |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1105 DWORD name_size, color_size; |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1106 char *name_buffer = full_name_buffer + SYSTEM_COLOR_PREFIX_LEN; |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1107 |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1108 name_size = sizeof (full_name_buffer) - SYSTEM_COLOR_PREFIX_LEN; |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1109 color_size = sizeof (color_buffer); |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1110 |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1111 strcpy (full_name_buffer, SYSTEM_COLOR_PREFIX); |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1112 |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1113 while (RegEnumValueA (colors_key, index, name_buffer, &name_size, |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1114 NULL, NULL, color_buffer, &color_size) |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1115 == ERROR_SUCCESS) |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1116 { |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1117 int r, g, b; |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1118 if (sscanf (color_buffer, " %u %u %u", &r, &g, &b) == 3) |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1119 *system_colors = Fcons (Fcons (build_string (full_name_buffer), |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1120 make_number (RGB (r, g, b))), |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1121 *system_colors); |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1122 |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1123 name_size = sizeof (full_name_buffer) - SYSTEM_COLOR_PREFIX_LEN; |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1124 color_size = sizeof (color_buffer); |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1125 index++; |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1126 } |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1127 RegCloseKey (colors_key); |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1128 } |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1129 |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1130 UNBLOCK_INPUT; |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1131 } |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1132 |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
1133 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1134 COLORREF |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1135 x_to_w32_color (colorname) |
13434 | 1136 char * colorname; |
1137 { | |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
1138 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
|
1139 |
13434 | 1140 BLOCK_INPUT; |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1141 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1142 if (colorname[0] == '#') |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1143 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1144 /* 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
|
1145 char *color; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1146 int size; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1147 color = colorname + 1; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1148 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1149 size = strlen(color); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1150 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
|
1151 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1152 UINT colorval; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1153 int i, pos; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1154 pos = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1155 size /= 3; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1156 colorval = 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1157 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1158 for (i = 0; i < 3; i++) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1159 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1160 char *end; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1161 char t; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1162 unsigned long value; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1163 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1164 /* 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
|
1165 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
|
1166 our numbers, and we don't. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1167 if (!isxdigit(color[0]) || color[1] == 'x') |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1168 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1169 t = color[size]; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1170 color[size] = '\0'; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1171 value = strtoul(color, &end, 16); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1172 color[size] = t; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1173 if (errno == ERANGE || end - color != size) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1174 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1175 switch (size) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1176 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1177 case 1: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1178 value = value * 0x10; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1179 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1180 case 2: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1181 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1182 case 3: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1183 value /= 0x10; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1184 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1185 case 4: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1186 value /= 0x100; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1187 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1188 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1189 colorval |= (value << pos); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1190 pos += 0x8; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1191 if (i == 2) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1192 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1193 UNBLOCK_INPUT; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1194 return (colorval); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1195 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1196 color = end; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1197 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1198 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1199 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1200 else if (strnicmp(colorname, "rgb:", 4) == 0) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1201 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1202 char *color; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1203 UINT colorval; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1204 int i, pos; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1205 pos = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1206 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1207 colorval = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1208 color = colorname + 4; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1209 for (i = 0; i < 3; i++) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1210 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1211 char *end; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1212 unsigned long value; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1213 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1214 /* 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
|
1215 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
|
1216 our numbers, and we don't. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1217 if (!isxdigit(color[0]) || color[1] == 'x') |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1218 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1219 value = strtoul(color, &end, 16); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1220 if (errno == ERANGE) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1221 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1222 switch (end - color) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1223 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1224 case 1: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1225 value = value * 0x10 + value; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1226 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1227 case 2: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1228 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1229 case 3: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1230 value /= 0x10; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1231 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1232 case 4: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1233 value /= 0x100; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1234 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1235 default: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1236 value = ULONG_MAX; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1237 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1238 if (value == ULONG_MAX) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1239 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1240 colorval |= (value << pos); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1241 pos += 0x8; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1242 if (i == 2) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1243 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1244 if (*end != '\0') |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1245 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1246 UNBLOCK_INPUT; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1247 return (colorval); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1248 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1249 if (*end != '/') |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1250 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1251 color = end + 1; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1252 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1253 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1254 else if (strnicmp(colorname, "rgbi:", 5) == 0) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1255 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1256 /* This is an RGB Intensity specification. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1257 char *color; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1258 UINT colorval; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1259 int i, pos; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1260 pos = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1261 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1262 colorval = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1263 color = colorname + 5; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1264 for (i = 0; i < 3; i++) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1265 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1266 char *end; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1267 double value; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1268 UINT val; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1269 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1270 value = strtod(color, &end); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1271 if (errno == ERANGE) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1272 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1273 if (value < 0.0 || value > 1.0) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1274 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1275 val = (UINT)(0x100 * value); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1276 /* 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
|
1277 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
|
1278 fixes the 1.0 case. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1279 if (val == 0x100) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1280 val = 0xFF; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1281 colorval |= (val << pos); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1282 pos += 0x8; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1283 if (i == 2) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1284 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1285 if (*end != '\0') |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1286 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1287 UNBLOCK_INPUT; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1288 return (colorval); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1289 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1290 if (*end != '/') |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1291 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1292 color = end + 1; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1293 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1294 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1295 /* 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
|
1296 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
|
1297 RGB. */ |
23314
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1298 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1299 /* 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
|
1300 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
|
1301 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
|
1302 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
|
1303 ret = w32_color_map_lookup (colorname); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1304 if (NILP (ret)) |
13434 | 1305 { |
23314
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1306 int len = strlen (colorname); |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1307 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1308 if (isdigit (colorname[len - 1])) |
13434 | 1309 { |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
1310 char *ptr, *approx = alloca (len + 1); |
23314
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1311 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1312 strcpy (approx, colorname); |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1313 ptr = &approx[len - 1]; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1314 while (ptr > approx && isdigit (*ptr)) |
23314
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1315 *ptr-- = '\0'; |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1316 |
87acd2b6ce97
(w32_color_map_lookup): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23160
diff
changeset
|
1317 ret = w32_color_map_lookup (approx); |
13434 | 1318 } |
1319 } | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1320 |
13434 | 1321 UNBLOCK_INPUT; |
1322 return ret; | |
1323 } | |
1324 | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1325 void |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1326 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
|
1327 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1328 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
|
1329 LOGPALETTE * log_palette; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1330 HPALETTE new_palette; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1331 int i; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1332 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1333 /* 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
|
1334 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
|
1335 return; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1336 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1337 log_palette = (LOGPALETTE *) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1338 alloca (sizeof (LOGPALETTE) + |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1339 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
|
1340 log_palette->palVersion = 0x300; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1341 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
|
1342 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1343 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
|
1344 for (i = 0; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1345 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
|
1346 i++, list = list->next) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1347 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
|
1348 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1349 new_palette = CreatePalette (log_palette); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1350 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1351 enter_crit (); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1352 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1353 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
|
1354 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
|
1355 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
|
1356 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1357 /* 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
|
1358 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
|
1359 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1360 leave_crit (); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1361 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1362 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1363 #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
|
1364 #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
|
1365 do \ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1366 { \ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1367 pe.peRed = GetRValue (color); \ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1368 pe.peGreen = GetGValue (color); \ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1369 pe.peBlue = GetBValue (color); \ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1370 pe.peFlags = 0; \ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1371 } while (0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1372 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1373 #if 0 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1374 /* 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
|
1375 void |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1376 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
|
1377 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1378 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
|
1379 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1380 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
|
1381 return; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1382 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1383 /* 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
|
1384 while (list) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1385 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1386 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
|
1387 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1388 ++list->refcount; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1389 return; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1390 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1391 list = list->next; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1392 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1393 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1394 /* 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
|
1395 list = (struct w32_palette_entry *) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1396 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
|
1397 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
|
1398 list->refcount = 1; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1399 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
|
1400 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
|
1401 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
|
1402 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1403 /* 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
|
1404 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
|
1405 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1406 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1407 void |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1408 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
|
1409 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1410 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
|
1411 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
|
1412 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1413 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
|
1414 return; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1415 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1416 /* 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
|
1417 while (list) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1418 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1419 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
|
1420 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1421 if (--list->refcount == 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1422 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1423 *prev = list->next; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1424 xfree (list); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1425 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
|
1426 break; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1427 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1428 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1429 return; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1430 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1431 prev = &list->next; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1432 list = list->next; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1433 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1434 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1435 /* 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
|
1436 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
|
1437 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1438 #endif |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1439 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1440 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1441 /* Gamma-correct COLOR on frame F. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1442 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1443 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1444 gamma_correct (f, color) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1445 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1446 COLORREF *color; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1447 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1448 if (f->gamma) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1449 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1450 *color = PALETTERGB ( |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1451 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
|
1452 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
|
1453 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
|
1454 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1455 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1456 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1457 |
13434 | 1458 /* Decide if color named COLOR is valid for the display associated with |
1459 the selected frame; if so, return the rgb values in COLOR_DEF. | |
1460 If ALLOC is nonzero, allocate a new colormap cell. */ | |
1461 | |
1462 int | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1463 w32_defined_color (f, color, color_def, alloc) |
13434 | 1464 FRAME_PTR f; |
1465 char *color; | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1466 XColor *color_def; |
13434 | 1467 int alloc; |
1468 { | |
1469 register Lisp_Object tem; | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1470 COLORREF w32_color_ref; |
14353 | 1471 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1472 tem = x_to_w32_color (color); |
14353 | 1473 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1474 if (!NILP (tem)) |
13434 | 1475 { |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1476 if (f) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1477 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1478 /* Apply gamma correction. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1479 w32_color_ref = XUINT (tem); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1480 gamma_correct (f, &w32_color_ref); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1481 XSETINT (tem, w32_color_ref); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1482 } |
27407
7df920562cbe
(w32_defined_color): Apply gamma correction before trying to map to
Jason Rumney <jasonr@gnu.org>
parents:
27397
diff
changeset
|
1483 |
7df920562cbe
(w32_defined_color): Apply gamma correction before trying to map to
Jason Rumney <jasonr@gnu.org>
parents:
27397
diff
changeset
|
1484 /* 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
|
1485 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
|
1486 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1487 struct w32_palette_entry * entry = |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1488 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
|
1489 struct w32_palette_entry ** prev = |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1490 &one_w32_display_info.color_list; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1491 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1492 /* 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
|
1493 while (entry) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1494 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1495 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
|
1496 break; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1497 prev = &entry->next; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1498 entry = entry->next; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1499 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1500 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1501 if (entry == NULL && alloc) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1502 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1503 /* 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
|
1504 entry = (struct w32_palette_entry *) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1505 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
|
1506 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
|
1507 entry->next = NULL; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1508 *prev = entry; |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
1509 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
|
1510 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1511 /* 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
|
1512 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
|
1513 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1514 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1515 /* 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
|
1516 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
|
1517 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
|
1518 w32_color_ref = XUINT (tem) | 0x2000000; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1519 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1520 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
|
1521 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
|
1522 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
|
1523 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
|
1524 |
13434 | 1525 return 1; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
1526 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1527 else |
14353 | 1528 { |
1529 return 0; | |
1530 } | |
13434 | 1531 } |
1532 | |
1533 /* Given a string ARG naming a color, compute a pixel value from it | |
1534 suitable for screen F. | |
1535 If F is not a color screen, return DEF (default) regardless of what | |
1536 ARG says. */ | |
1537 | |
1538 int | |
1539 x_decode_color (f, arg, def) | |
1540 FRAME_PTR f; | |
1541 Lisp_Object arg; | |
1542 int def; | |
1543 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1544 XColor cdef; |
13434 | 1545 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1546 CHECK_STRING (arg); |
13434 | 1547 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1548 if (strcmp (SDATA (arg), "black") == 0) |
13434 | 1549 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
|
1550 else if (strcmp (SDATA (arg), "white") == 0) |
13434 | 1551 return WHITE_PIX_DEFAULT (f); |
1552 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1553 if ((FRAME_W32_DISPLAY_INFO (f)->n_planes * FRAME_W32_DISPLAY_INFO (f)->n_cbits) == 1) |
13434 | 1554 return def; |
1555 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1556 /* w32_defined_color is responsible for coping with failures |
13434 | 1557 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
|
1558 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
|
1559 return cdef.pixel; |
13434 | 1560 |
1561 /* defined_color failed; return an ultimate default. */ | |
1562 return def; | |
1563 } | |
1564 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1565 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1566 |
13434 | 1567 /* Functions called only from `x_set_frame_param' |
1568 to set individual parameters. | |
1569 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1570 If FRAME_W32_WINDOW (f) is 0, |
13434 | 1571 the frame is being created and its window does not exist yet. |
1572 In that case, just record the parameter's new value | |
1573 in the standard place; do not attempt to change the window. */ | |
1574 | |
1575 void | |
1576 x_set_foreground_color (f, arg, oldval) | |
1577 struct frame *f; | |
1578 Lisp_Object arg, oldval; | |
1579 { | |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
1580 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
|
1581 PIX_TYPE fg, old_fg; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
1582 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
1583 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
|
1584 old_fg = FRAME_FOREGROUND_PIXEL (f); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
1585 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
|
1586 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1587 if (FRAME_W32_WINDOW (f) != 0) |
13434 | 1588 { |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
1589 if (x->cursor_pixel == old_fg) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
1590 x->cursor_pixel = fg; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
1591 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1592 update_face_from_frame_parameter (f, Qforeground_color, arg); |
13434 | 1593 if (FRAME_VISIBLE_P (f)) |
1594 redraw_frame (f); | |
1595 } | |
1596 } | |
1597 | |
1598 void | |
1599 x_set_background_color (f, arg, oldval) | |
1600 struct frame *f; | |
1601 Lisp_Object arg, oldval; | |
1602 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1603 FRAME_BACKGROUND_PIXEL (f) |
13434 | 1604 = x_decode_color (f, arg, WHITE_PIX_DEFAULT (f)); |
1605 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1606 if (FRAME_W32_WINDOW (f) != 0) |
13434 | 1607 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1608 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
|
1609 FRAME_BACKGROUND_PIXEL (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1610 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1611 update_face_from_frame_parameter (f, Qbackground_color, arg); |
13434 | 1612 |
1613 if (FRAME_VISIBLE_P (f)) | |
1614 redraw_frame (f); | |
1615 } | |
1616 } | |
1617 | |
1618 void | |
1619 x_set_mouse_color (f, arg, oldval) | |
1620 struct frame *f; | |
1621 Lisp_Object arg, oldval; | |
1622 { | |
50229
e3a41ffa1cba
Remove setup of cross_cursor (already has hand_cursor).
Kim F. Storm <storm@cua.dk>
parents:
50164
diff
changeset
|
1623 Cursor cursor, nontext_cursor, mode_cursor, hand_cursor; |
17632
d2915156a803
(x_set_mouse_color): Update calls to x_catch_errors
Richard M. Stallman <rms@gnu.org>
parents:
16884
diff
changeset
|
1624 int count; |
13434 | 1625 int mask_color; |
1626 | |
1627 if (!EQ (Qnil, arg)) | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1628 f->output_data.w32->mouse_pixel |
13434 | 1629 = 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
|
1630 mask_color = FRAME_BACKGROUND_PIXEL (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1631 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1632 /* 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
|
1633 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
|
1634 && mask_color == FRAME_BACKGROUND_PIXEL (f)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1635 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
|
1636 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
1637 #if 0 /* TODO : cursor changes */ |
13434 | 1638 BLOCK_INPUT; |
1639 | |
1640 /* 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
|
1641 count = x_catch_errors (FRAME_W32_DISPLAY (f)); |
13434 | 1642 |
1643 if (!EQ (Qnil, Vx_pointer_shape)) | |
1644 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1645 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
|
1646 cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XINT (Vx_pointer_shape)); |
13434 | 1647 } |
1648 else | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1649 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
|
1650 x_check_errors (FRAME_W32_DISPLAY (f), "bad text pointer cursor: %s"); |
13434 | 1651 |
1652 if (!EQ (Qnil, Vx_nontext_pointer_shape)) | |
1653 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1654 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
|
1655 nontext_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), |
13434 | 1656 XINT (Vx_nontext_pointer_shape)); |
1657 } | |
1658 else | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1659 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
|
1660 x_check_errors (FRAME_W32_DISPLAY (f), "bad nontext pointer cursor: %s"); |
13434 | 1661 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
1662 if (!EQ (Qnil, Vx_hourglass_pointer_shape)) |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
1663 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1664 CHECK_NUMBER (Vx_hourglass_pointer_shape); |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
1665 hourglass_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
1666 XINT (Vx_hourglass_pointer_shape)); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
1667 } |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
1668 else |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
1669 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
|
1670 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
|
1671 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1672 x_check_errors (FRAME_W32_DISPLAY (f), "bad nontext pointer cursor: %s"); |
13434 | 1673 if (!EQ (Qnil, Vx_mode_pointer_shape)) |
1674 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1675 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
|
1676 mode_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), |
13434 | 1677 XINT (Vx_mode_pointer_shape)); |
1678 } | |
1679 else | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1680 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
|
1681 x_check_errors (FRAME_W32_DISPLAY (f), "bad modeline pointer cursor: %s"); |
13434 | 1682 |
1683 if (!EQ (Qnil, Vx_sensitive_text_pointer_shape)) | |
1684 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1685 CHECK_NUMBER (Vx_sensitive_text_pointer_shape); |
50229
e3a41ffa1cba
Remove setup of cross_cursor (already has hand_cursor).
Kim F. Storm <storm@cua.dk>
parents:
50164
diff
changeset
|
1686 hand_cursor |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1687 = XCreateFontCursor (FRAME_W32_DISPLAY (f), |
13434 | 1688 XINT (Vx_sensitive_text_pointer_shape)); |
1689 } | |
1690 else | |
50229
e3a41ffa1cba
Remove setup of cross_cursor (already has hand_cursor).
Kim F. Storm <storm@cua.dk>
parents:
50164
diff
changeset
|
1691 hand_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XC_crosshair); |
13434 | 1692 |
34133
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
1693 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
|
1694 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1695 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
|
1696 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
|
1697 = 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
|
1698 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
|
1699 } |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
1700 else |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
1701 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
|
1702 = 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
|
1703 |
13434 | 1704 /* 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
|
1705 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
|
1706 x_uncatch_errors (FRAME_W32_DISPLAY (f), count); |
13434 | 1707 |
1708 { | |
1709 XColor fore_color, back_color; | |
1710 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1711 fore_color.pixel = f->output_data.w32->mouse_pixel; |
13434 | 1712 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
|
1713 XQueryColor (FRAME_W32_DISPLAY (f), |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1714 DefaultColormap (FRAME_W32_DISPLAY (f), |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1715 DefaultScreen (FRAME_W32_DISPLAY (f))), |
13434 | 1716 &fore_color); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1717 XQueryColor (FRAME_W32_DISPLAY (f), |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1718 DefaultColormap (FRAME_W32_DISPLAY (f), |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1719 DefaultScreen (FRAME_W32_DISPLAY (f))), |
13434 | 1720 &back_color); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1721 XRecolorCursor (FRAME_W32_DISPLAY (f), cursor, |
13434 | 1722 &fore_color, &back_color); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1723 XRecolorCursor (FRAME_W32_DISPLAY (f), nontext_cursor, |
13434 | 1724 &fore_color, &back_color); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1725 XRecolorCursor (FRAME_W32_DISPLAY (f), mode_cursor, |
13434 | 1726 &fore_color, &back_color); |
50229
e3a41ffa1cba
Remove setup of cross_cursor (already has hand_cursor).
Kim F. Storm <storm@cua.dk>
parents:
50164
diff
changeset
|
1727 XRecolorCursor (FRAME_W32_DISPLAY (f), hand_cursor, |
13434 | 1728 &fore_color, &back_color); |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
1729 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
|
1730 &fore_color, &back_color); |
13434 | 1731 } |
1732 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1733 if (FRAME_W32_WINDOW (f) != 0) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1734 XDefineCursor (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), cursor); |
13434 | 1735 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1736 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
|
1737 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
|
1738 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
|
1739 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1740 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
|
1741 && 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
|
1742 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
|
1743 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
|
1744 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
1745 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
|
1746 && f->output_data.w32->hourglass_cursor != 0) |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
1747 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
|
1748 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
|
1749 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1750 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
|
1751 && 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
|
1752 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
|
1753 f->output_data.w32->modeline_cursor = mode_cursor; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1754 |
50229
e3a41ffa1cba
Remove setup of cross_cursor (already has hand_cursor).
Kim F. Storm <storm@cua.dk>
parents:
50164
diff
changeset
|
1755 if (hand_cursor != f->output_data.w32->hand_cursor |
e3a41ffa1cba
Remove setup of cross_cursor (already has hand_cursor).
Kim F. Storm <storm@cua.dk>
parents:
50164
diff
changeset
|
1756 && f->output_data.w32->hand_cursor != 0) |
e3a41ffa1cba
Remove setup of cross_cursor (already has hand_cursor).
Kim F. Storm <storm@cua.dk>
parents:
50164
diff
changeset
|
1757 XFreeCursor (FRAME_W32_DISPLAY (f), f->output_data.w32->hand_cursor); |
e3a41ffa1cba
Remove setup of cross_cursor (already has hand_cursor).
Kim F. Storm <storm@cua.dk>
parents:
50164
diff
changeset
|
1758 f->output_data.w32->hand_cursor = hand_cursor; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1759 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1760 XFlush (FRAME_W32_DISPLAY (f)); |
13434 | 1761 UNBLOCK_INPUT; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1762 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1763 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
|
1764 #endif /* TODO */ |
13434 | 1765 } |
1766 | |
34062
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
1767 /* Defined in w32term.c. */ |
13434 | 1768 void |
1769 x_set_cursor_color (f, arg, oldval) | |
1770 struct frame *f; | |
1771 Lisp_Object arg, oldval; | |
1772 { | |
34062
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
1773 unsigned long fore_pixel, pixel; |
13434 | 1774 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
1775 if (!NILP (Vx_cursor_fore_pixel)) |
13434 | 1776 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
|
1777 WHITE_PIX_DEFAULT (f)); |
13434 | 1778 else |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1779 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
|
1780 |
34089 | 1781 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
|
1782 |
13434 | 1783 /* 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
|
1784 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
|
1785 { |
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
1786 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
|
1787 if (pixel == fore_pixel) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1788 fore_pixel = FRAME_BACKGROUND_PIXEL (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1789 } |
34062
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
1790 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
1791 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
|
1792 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
|
1793 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1794 if (FRAME_W32_WINDOW (f) != 0) |
13434 | 1795 { |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
1796 BLOCK_INPUT; |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
1797 /* Update frame's cursor_gc. */ |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
1798 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
|
1799 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
|
1800 |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
1801 UNBLOCK_INPUT; |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
1802 |
13434 | 1803 if (FRAME_VISIBLE_P (f)) |
1804 { | |
34062
0044985507c7
(x_set_cursor_color): Use x_update_cursor instead of x_display_cursor.
Jason Rumney <jasonr@gnu.org>
parents:
33929
diff
changeset
|
1805 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
|
1806 x_update_cursor (f, 1); |
13434 | 1807 } |
1808 } | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1809 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1810 update_face_from_frame_parameter (f, Qcursor_color, arg); |
13434 | 1811 } |
1812 | |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
1813 /* 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
|
1814 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
|
1815 F has a window. */ |
50362
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
1816 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
1817 void |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
1818 x_set_border_pixel (f, pix) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
1819 struct frame *f; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
1820 int pix; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
1821 { |
50362
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
1822 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
1823 f->output_data.w32->border_pixel = pix; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
1824 |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
1825 if (FRAME_W32_WINDOW (f) != 0 && f->border_width > 0) |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
1826 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
1827 if (FRAME_VISIBLE_P (f)) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
1828 redraw_frame (f); |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
1829 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
1830 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
1831 |
13434 | 1832 /* Set the border-color of frame F to value described by ARG. |
1833 ARG can be a string naming a color. | |
1834 The border-color is used for the border that is drawn by the server. | |
1835 Note that this does not fully take effect if done before | |
1836 F has a window; it must be redone when the window is created. */ | |
1837 | |
1838 void | |
1839 x_set_border_color (f, arg, oldval) | |
1840 struct frame *f; | |
1841 Lisp_Object arg, oldval; | |
1842 { | |
1843 int pix; | |
1844 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
1845 CHECK_STRING (arg); |
13434 | 1846 pix = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f)); |
1847 x_set_border_pixel (f, pix); | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1848 update_face_from_frame_parameter (f, Qborder_color, arg); |
13434 | 1849 } |
1850 | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
1851 |
13434 | 1852 void |
1853 x_set_cursor_type (f, arg, oldval) | |
1854 FRAME_PTR f; | |
1855 Lisp_Object arg, oldval; | |
1856 { | |
47140
9ef4bf7492cb
(Vblink_cursor_alist): Removed.
Kim F. Storm <storm@cua.dk>
parents:
47097
diff
changeset
|
1857 set_frame_cursor_types (f, arg); |
13434 | 1858 |
49392
4e6b3d53732a
(x_set_cursor_type): Set cursor_type_changed,
Jason Rumney <jasonr@gnu.org>
parents:
49369
diff
changeset
|
1859 /* Make sure the cursor gets redrawn. */ |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
1860 cursor_type_changed = 1; |
13434 | 1861 } |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
1862 |
13434 | 1863 void |
1864 x_set_icon_type (f, arg, oldval) | |
1865 struct frame *f; | |
1866 Lisp_Object arg, oldval; | |
1867 { | |
1868 int result; | |
1869 | |
25235
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
1870 if (NILP (arg) && NILP (oldval)) |
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
1871 return; |
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
1872 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1873 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
|
1874 && 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
|
1875 return; |
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
1876 |
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
1877 if (SYMBOLP (arg) && SYMBOLP (oldval) && EQ (arg, oldval)) |
13434 | 1878 return; |
1879 | |
1880 BLOCK_INPUT; | |
25235
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
1881 |
98c67187cd6b
(x_set_icon_type): Support setting frame icons.
Geoff Voelker <voelker@cs.washington.edu>
parents:
25084
diff
changeset
|
1882 result = x_bitmap_icon (f, arg); |
13434 | 1883 if (result) |
1884 { | |
1885 UNBLOCK_INPUT; | |
1886 error ("No icon window available"); | |
1887 } | |
1888 | |
1889 UNBLOCK_INPUT; | |
1890 } | |
1891 | |
1892 void | |
1893 x_set_icon_name (f, arg, oldval) | |
1894 struct frame *f; | |
1895 Lisp_Object arg, oldval; | |
1896 { | |
1897 if (STRINGP (arg)) | |
1898 { | |
1899 if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt)) | |
1900 return; | |
1901 } | |
1902 else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil)) | |
1903 return; | |
1904 | |
1905 f->icon_name = arg; | |
1906 | |
1907 #if 0 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1908 if (f->output_data.w32->icon_bitmap != 0) |
13434 | 1909 return; |
1910 | |
1911 BLOCK_INPUT; | |
1912 | |
1913 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
|
1914 (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
|
1915 ? 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
|
1916 : !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
|
1917 ? f->title |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1918 : f->name))); |
13434 | 1919 |
1920 if (result) | |
1921 { | |
1922 UNBLOCK_INPUT; | |
1923 error ("No icon window available"); | |
1924 } | |
1925 | |
1926 /* If the window was unmapped (and its icon was mapped), | |
1927 the new icon is not mapped, so map the window in its stead. */ | |
1928 if (FRAME_VISIBLE_P (f)) | |
1929 { | |
1930 #ifdef USE_X_TOOLKIT | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1931 XtPopup (f->output_data.w32->widget, XtGrabNone); |
13434 | 1932 #endif |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1933 XMapWindow (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f)); |
13434 | 1934 } |
1935 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
1936 XFlush (FRAME_W32_DISPLAY (f)); |
13434 | 1937 UNBLOCK_INPUT; |
1938 #endif | |
1939 } | |
1940 | |
33870
8816b5542315
(x_change_window_heights): New function.
Jason Rumney <jasonr@gnu.org>
parents:
33865
diff
changeset
|
1941 |
13434 | 1942 void |
1943 x_set_menu_bar_lines (f, value, oldval) | |
1944 struct frame *f; | |
1945 Lisp_Object value, oldval; | |
1946 { | |
1947 int nlines; | |
1948 int olines = FRAME_MENU_BAR_LINES (f); | |
1949 | |
1950 /* Right now, menu bars don't work properly in minibuf-only frames; | |
1951 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
|
1952 frame itself, and get an error because you can't switch buffers |
13434 | 1953 in or split the minibuffer window. */ |
1954 if (FRAME_MINIBUF_ONLY_P (f)) | |
1955 return; | |
1956 | |
1957 if (INTEGERP (value)) | |
1958 nlines = XINT (value); | |
1959 else | |
1960 nlines = 0; | |
1961 | |
1962 FRAME_MENU_BAR_LINES (f) = 0; | |
1963 if (nlines) | |
1964 FRAME_EXTERNAL_MENU_BAR (f) = 1; | |
1965 else | |
1966 { | |
1967 if (FRAME_EXTERNAL_MENU_BAR (f) == 1) | |
1968 free_frame_menubar (f); | |
1969 FRAME_EXTERNAL_MENU_BAR (f) = 0; | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1970 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
1971 /* 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
|
1972 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
|
1973 set correctly. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
1974 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1975 do_pending_window_change (0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1976 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1977 adjust_glyphs (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1978 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1979 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1980 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1981 /* 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
|
1982 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
|
1983 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
|
1984 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
|
1985 The frame's height doesn't change. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1986 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1987 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1988 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
|
1989 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1990 Lisp_Object value, oldval; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1991 { |
33865
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
1992 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
|
1993 Lisp_Object root_window; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1994 |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
1995 /* Treat tool bars like menu bars. */ |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
1996 if (FRAME_MINIBUF_ONLY_P (f)) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
1997 return; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
1998 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
1999 /* Use VALUE only if an integer >= 0. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2000 if (INTEGERP (value) && XINT (value) >= 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2001 nlines = XFASTINT (value); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2002 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2003 nlines = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2004 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2005 /* 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
|
2006 ++windows_or_buffers_changed; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2007 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2008 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
|
2009 |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2010 /* 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
|
2011 root_window = FRAME_ROOT_WINDOW (f); |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2012 root_height = WINDOW_TOTAL_LINES (XWINDOW (root_window)); |
33865
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2013 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
|
2014 { |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2015 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
|
2016 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
|
2017 } |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2018 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2019 FRAME_TOOL_BAR_LINES (f) = nlines; |
50362
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
2020 change_window_heights (root_window, delta); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2021 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
|
2022 |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2023 /* 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
|
2024 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
|
2025 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
|
2026 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
|
2027 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
|
2028 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
|
2029 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
|
2030 { |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2031 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
|
2032 clear_frame (); |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2033 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
|
2034 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
|
2035 } |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2036 |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2037 /* 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
|
2038 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
|
2039 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
|
2040 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
|
2041 { |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2042 int height = FRAME_INTERNAL_BORDER_WIDTH (f); |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2043 int width = FRAME_PIXEL_WIDTH (f); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2044 int y = nlines * FRAME_LINE_HEIGHT (f); |
33865
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2045 |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2046 BLOCK_INPUT; |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2047 { |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2048 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
|
2049 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
|
2050 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
|
2051 } |
f32333d8172b
(x_set_tool_bar_lines): Clear internal border when making tool bar
Jason Rumney <jasonr@gnu.org>
parents:
33443
diff
changeset
|
2052 UNBLOCK_INPUT; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2053 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2054 if (WINDOWP (f->tool_bar_window)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
2055 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
|
2056 } |
27397
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 |
13434 | 2059 |
2060 /* 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
|
2061 w32_id_name. |
13434 | 2062 |
2063 If EXPLICIT is non-zero, that indicates that lisp code is setting the | |
2064 name; if NAME is a string, set F's name to NAME and set | |
2065 F->explicit_name; if NAME is Qnil, then clear F->explicit_name. | |
2066 | |
2067 If EXPLICIT is zero, that indicates that Emacs redisplay code is | |
2068 suggesting a new name, which lisp code should override; if | |
2069 F->explicit_name is set, ignore the new name; otherwise, set it. */ | |
2070 | |
2071 void | |
2072 x_set_name (f, name, explicit) | |
2073 struct frame *f; | |
2074 Lisp_Object name; | |
2075 int explicit; | |
2076 { | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2077 /* Make sure that requests from lisp code override requests from |
13434 | 2078 Emacs redisplay code. */ |
2079 if (explicit) | |
2080 { | |
2081 /* If we're switching from explicit to implicit, we had better | |
2082 update the mode lines and thereby update the title. */ | |
2083 if (f->explicit_name && NILP (name)) | |
2084 update_mode_lines = 1; | |
2085 | |
2086 f->explicit_name = ! NILP (name); | |
2087 } | |
2088 else if (f->explicit_name) | |
2089 return; | |
2090 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2091 /* If NAME is nil, set the name to the w32_id_name. */ |
13434 | 2092 if (NILP (name)) |
2093 { | |
2094 /* Check for no change needed in this very common case | |
2095 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
|
2096 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
|
2097 SDATA (f->name))) |
13434 | 2098 return; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2099 name = build_string (FRAME_W32_DISPLAY_INFO (f)->w32_id_name); |
13434 | 2100 } |
2101 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
2102 CHECK_STRING (name); |
13434 | 2103 |
2104 /* Don't change the name if it's already NAME. */ | |
2105 if (! NILP (Fstring_equal (name, f->name))) | |
2106 return; | |
2107 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2108 f->name = name; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2109 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2110 /* 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
|
2111 the name parameter. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2112 if (! NILP (f->title)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2113 name = f->title; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2114 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2115 if (FRAME_W32_WINDOW (f)) |
13434 | 2116 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2117 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
|
2118 name = ENCODE_SYSTEM (name); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2119 |
13434 | 2120 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
|
2121 SetWindowText(FRAME_W32_WINDOW (f), SDATA (name)); |
13434 | 2122 UNBLOCK_INPUT; |
2123 } | |
2124 } | |
2125 | |
2126 /* This function should be called when the user's lisp code has | |
2127 specified a name for the frame; the name will override any set by the | |
2128 redisplay code. */ | |
2129 void | |
2130 x_explicitly_set_name (f, arg, oldval) | |
2131 FRAME_PTR f; | |
2132 Lisp_Object arg, oldval; | |
2133 { | |
2134 x_set_name (f, arg, 1); | |
2135 } | |
2136 | |
2137 /* This function should be called by Emacs redisplay code to set the | |
2138 name; names set this way will never override names set by the user's | |
2139 lisp code. */ | |
2140 void | |
2141 x_implicitly_set_name (f, arg, oldval) | |
2142 FRAME_PTR f; | |
2143 Lisp_Object arg, oldval; | |
2144 { | |
2145 x_set_name (f, arg, 0); | |
2146 } | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2147 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2148 /* 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
|
2149 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
|
2150 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2151 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
|
2152 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
|
2153 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
|
2154 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2155 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
|
2156 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
|
2157 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
|
2158 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2159 void |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2160 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
|
2161 struct frame *f; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2162 Lisp_Object name, old_name; |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2163 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2164 /* 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
|
2165 if (EQ (name, f->title)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2166 return; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2167 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2168 update_mode_lines = 1; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2169 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2170 f->title = name; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2171 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2172 if (NILP (name)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2173 name = f->name; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2174 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2175 if (FRAME_W32_WINDOW (f)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2176 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2177 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
|
2178 name = ENCODE_SYSTEM (name); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2179 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2180 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
|
2181 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
|
2182 UNBLOCK_INPUT; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2183 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2184 } |
50362
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
2185 |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
2186 |
50377
174f757a8504
(x_set_scroll_bar_default_width): Define return value as void.
Juanma Barranquero <lekktu@gmail.com>
parents:
50362
diff
changeset
|
2187 void x_set_scroll_bar_default_width (f) |
13434 | 2188 struct frame *f; |
2189 { | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2190 int wid = FRAME_COLUMN_WIDTH (f); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2191 |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2192 FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = GetSystemMetrics (SM_CXVSCROLL); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2193 FRAME_CONFIG_SCROLL_BAR_COLS (f) = (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) + |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2194 wid - 1) / wid; |
50362
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
2195 } |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
2196 |
13434 | 2197 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2198 /* Subroutines of creating a frame. */ |
13434 | 2199 |
2200 | |
2201 /* Return the value of parameter PARAM. | |
2202 | |
2203 First search ALIST, then Vdefault_frame_alist, then the X defaults | |
2204 database, using ATTRIBUTE as the attribute name and CLASS as its class. | |
2205 | |
2206 Convert the resource to the type specified by desired_type. | |
2207 | |
2208 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
|
2209 w32_get_arg, make sure you deal with Qunbound in a reasonable way, |
13434 | 2210 and don't let it get stored in any Lisp-visible variables! */ |
2211 | |
2212 static Lisp_Object | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2213 w32_get_arg (alist, param, attribute, class, type) |
13434 | 2214 Lisp_Object alist, param; |
2215 char *attribute; | |
2216 char *class; | |
2217 enum resource_types type; | |
2218 { | |
50362
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
2219 return x_get_arg (check_x_display_info (Qnil), |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
2220 alist, param, attribute, class, type); |
13434 | 2221 } |
2222 | |
2223 | |
49369
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2224 Cursor |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2225 w32_load_cursor (LPCTSTR name) |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2226 { |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2227 /* Try first to load cursor from application resource. */ |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2228 Cursor cursor = LoadImage ((HINSTANCE) GetModuleHandle(NULL), |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2229 name, IMAGE_CURSOR, 0, 0, |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2230 LR_DEFAULTCOLOR | LR_DEFAULTSIZE | LR_SHARED); |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2231 if (!cursor) |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2232 { |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2233 /* Then try to load a shared predefined cursor. */ |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2234 cursor = LoadImage (NULL, name, IMAGE_CURSOR, 0, 0, |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2235 LR_DEFAULTCOLOR | LR_DEFAULTSIZE | LR_SHARED); |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2236 } |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2237 return cursor; |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2238 } |
13434 | 2239 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2240 extern LRESULT CALLBACK w32_wnd_proc (); |
13434 | 2241 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2242 BOOL |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2243 w32_init_class (hinst) |
13434 | 2244 HINSTANCE hinst; |
2245 { | |
2246 WNDCLASS wc; | |
2247 | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2248 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
|
2249 wc.lpfnWndProc = (WNDPROC) w32_wnd_proc; |
13434 | 2250 wc.cbClsExtra = 0; |
2251 wc.cbWndExtra = WND_EXTRA_BYTES; | |
2252 wc.hInstance = hinst; | |
2253 wc.hIcon = LoadIcon (hinst, EMACS_CLASS); | |
49369
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
2254 wc.hCursor = w32_load_cursor (IDC_ARROW); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
2255 wc.hbrBackground = NULL; /* GetStockObject (WHITE_BRUSH); */ |
13434 | 2256 wc.lpszMenuName = NULL; |
2257 wc.lpszClassName = EMACS_CLASS; | |
2258 | |
2259 return (RegisterClass (&wc)); | |
2260 } | |
2261 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2262 HWND |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2263 w32_createscrollbar (f, bar) |
13434 | 2264 struct frame *f; |
2265 struct scroll_bar * bar; | |
2266 { | |
2267 return (CreateWindow ("SCROLLBAR", "", SBS_VERT | WS_CHILD | WS_VISIBLE, | |
2268 /* Position and size of scroll bar. */ | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2269 XINT(bar->left) + VERTICAL_SCROLL_BAR_WIDTH_TRIM, |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2270 XINT(bar->top), |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2271 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
|
2272 XINT(bar->height), |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2273 FRAME_W32_WINDOW (f), |
13434 | 2274 NULL, |
2275 hinst, | |
2276 NULL)); | |
2277 } | |
2278 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2279 void |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2280 w32_createwindow (f) |
13434 | 2281 struct frame *f; |
2282 { | |
2283 HWND hwnd; | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2284 RECT rect; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2285 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2286 rect.left = rect.top = 0; |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2287 rect.right = FRAME_PIXEL_WIDTH (f); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2288 rect.bottom = FRAME_PIXEL_HEIGHT (f); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2289 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2290 AdjustWindowRect (&rect, f->output_data.w32->dwStyle, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2291 FRAME_EXTERNAL_MENU_BAR (f)); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2292 |
13434 | 2293 /* Do first time app init */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2294 |
13434 | 2295 if (!hprevinst) |
2296 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2297 w32_init_class (hinst); |
13434 | 2298 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2299 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2300 FRAME_W32_WINDOW (f) = hwnd |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2301 = CreateWindow (EMACS_CLASS, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2302 f->namebuf, |
39137
2d2b989f4a4b
(w32_createwindow): Undo last change.
Andrew Innes <andrewi@gnu.org>
parents:
39128
diff
changeset
|
2303 f->output_data.w32->dwStyle | WS_CLIPCHILDREN, |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2304 f->left_pos, |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2305 f->top_pos, |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2306 rect.right - rect.left, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2307 rect.bottom - rect.top, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2308 NULL, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2309 NULL, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2310 hinst, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2311 NULL); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2312 |
13434 | 2313 if (hwnd) |
2314 { | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2315 SetWindowLong (hwnd, WND_FONTWIDTH_INDEX, FRAME_COLUMN_WIDTH (f)); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2316 SetWindowLong (hwnd, WND_LINEHEIGHT_INDEX, FRAME_LINE_HEIGHT (f)); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2317 SetWindowLong (hwnd, WND_BORDER_INDEX, FRAME_INTERNAL_BORDER_WIDTH (f)); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
2318 SetWindowLong (hwnd, WND_SCROLLBAR_INDEX, f->scroll_bar_actual_width); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
2319 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
|
2320 |
21884 | 2321 /* Enable drag-n-drop. */ |
2322 DragAcceptFiles (hwnd, TRUE); | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2323 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2324 /* 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
|
2325 ShowWindow (hwnd, SW_HIDE); |
13434 | 2326 } |
2327 } | |
2328 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2329 void |
13434 | 2330 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
|
2331 W32Msg * wmsg; |
13434 | 2332 HWND hwnd; |
2333 UINT msg; | |
2334 WPARAM wParam; | |
2335 LPARAM lParam; | |
2336 { | |
2337 wmsg->msg.hwnd = hwnd; | |
2338 wmsg->msg.message = msg; | |
2339 wmsg->msg.wParam = wParam; | |
2340 wmsg->msg.lParam = lParam; | |
2341 wmsg->msg.time = GetMessageTime (); | |
2342 | |
2343 post_msg (wmsg); | |
2344 } | |
2345 | |
16884
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16602
diff
changeset
|
2346 /* 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
|
2347 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
|
2348 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
|
2349 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
|
2350 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
|
2351 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
|
2352 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
|
2353 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
|
2354 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
|
2355 on Swedish keyboards). */ |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2356 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2357 #define EMACS_LCONTROL 0 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2358 #define EMACS_RCONTROL 1 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2359 #define EMACS_LMENU 2 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2360 #define EMACS_RMENU 3 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2361 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2362 static int modifiers[4]; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2363 static int modifiers_recorded; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2364 static int modifier_key_support_tested; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2365 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2366 static void |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2367 test_modifier_support (unsigned int wparam) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2368 { |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2369 unsigned int l, r; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2370 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2371 if (wparam != VK_CONTROL && wparam != VK_MENU) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2372 return; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2373 if (wparam == VK_CONTROL) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2374 { |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2375 l = VK_LCONTROL; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2376 r = VK_RCONTROL; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2377 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2378 else |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2379 { |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2380 l = VK_LMENU; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2381 r = VK_RMENU; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2382 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2383 if (!(GetKeyState (l) & 0x8000) && !(GetKeyState (r) & 0x8000)) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2384 modifiers_recorded = 1; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2385 else |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2386 modifiers_recorded = 0; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2387 modifier_key_support_tested = 1; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2388 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2389 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2390 static void |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2391 record_keydown (unsigned int wparam, unsigned int lparam) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2392 { |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2393 int i; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2394 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2395 if (!modifier_key_support_tested) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2396 test_modifier_support (wparam); |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2397 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2398 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
|
2399 return; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2400 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2401 if (wparam == VK_CONTROL) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2402 i = (lparam & 0x1000000) ? EMACS_RCONTROL : EMACS_LCONTROL; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2403 else |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2404 i = (lparam & 0x1000000) ? EMACS_RMENU : EMACS_LMENU; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2405 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2406 modifiers[i] = 1; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2407 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2408 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2409 static void |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2410 record_keyup (unsigned int wparam, unsigned int lparam) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2411 { |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2412 int i; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2413 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2414 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
|
2415 return; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2416 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2417 if (wparam == VK_CONTROL) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2418 i = (lparam & 0x1000000) ? EMACS_RCONTROL : EMACS_LCONTROL; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2419 else |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2420 i = (lparam & 0x1000000) ? EMACS_RMENU : EMACS_LMENU; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2421 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2422 modifiers[i] = 0; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2423 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2424 |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
2425 /* 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
|
2426 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
|
2427 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
|
2428 static void |
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
2429 reset_modifiers () |
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
2430 { |
15314
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
2431 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
|
2432 |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2433 if (GetFocus () == NULL) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2434 /* 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
|
2435 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
|
2436 |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
2437 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
|
2438 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
|
2439 |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
2440 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
|
2441 /* 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
|
2442 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
|
2443 |
796d825f4444
(reset_modifiers): Only clear a modifier if the modifier key has been
Richard M. Stallman <rms@gnu.org>
parents:
15290
diff
changeset
|
2444 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
|
2445 /* 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
|
2446 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
|
2447 |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2448 /* 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
|
2449 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
|
2450 result of a hot-key being pressed. */ |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2451 { |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2452 BYTE keystate[256]; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2453 |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2454 #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
|
2455 |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2456 GetKeyboardState (keystate); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2457 keystate[VK_SHIFT] = CURRENT_STATE (VK_SHIFT); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2458 keystate[VK_CONTROL] = CURRENT_STATE (VK_CONTROL); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2459 keystate[VK_LCONTROL] = CURRENT_STATE (VK_LCONTROL); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2460 keystate[VK_RCONTROL] = CURRENT_STATE (VK_RCONTROL); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2461 keystate[VK_MENU] = CURRENT_STATE (VK_MENU); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2462 keystate[VK_LMENU] = CURRENT_STATE (VK_LMENU); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2463 keystate[VK_RMENU] = CURRENT_STATE (VK_RMENU); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2464 keystate[VK_LWIN] = CURRENT_STATE (VK_LWIN); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2465 keystate[VK_RWIN] = CURRENT_STATE (VK_RWIN); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2466 keystate[VK_APPS] = CURRENT_STATE (VK_APPS); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2467 SetKeyboardState (keystate); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2468 } |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
2469 } |
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
2470 |
15377
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
2471 /* 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
|
2472 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
|
2473 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
|
2474 the left or right modifier should be set. */ |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
2475 static void |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
2476 sync_modifiers () |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
2477 { |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
2478 if (!modifiers_recorded) |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
2479 return; |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
2480 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2481 if (!(GetKeyState (VK_CONTROL) & 0x8000)) |
15377
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
2482 modifiers[EMACS_RCONTROL] = modifiers[EMACS_LCONTROL] = 0; |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
2483 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2484 if (!(GetKeyState (VK_MENU) & 0x8000)) |
15377
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
2485 modifiers[EMACS_RMENU] = modifiers[EMACS_LMENU] = 0; |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
2486 } |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
2487 |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2488 static int |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2489 modifier_set (int vkey) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2490 { |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2491 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
|
2492 return (GetKeyState (vkey) & 0x1); |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2493 if (!modifiers_recorded) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2494 return (GetKeyState (vkey) & 0x8000); |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2495 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2496 switch (vkey) |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2497 { |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2498 case VK_LCONTROL: |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2499 return modifiers[EMACS_LCONTROL]; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2500 case VK_RCONTROL: |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2501 return modifiers[EMACS_RCONTROL]; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2502 case VK_LMENU: |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2503 return modifiers[EMACS_LMENU]; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2504 case VK_RMENU: |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2505 return modifiers[EMACS_RMENU]; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2506 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2507 return (GetKeyState (vkey) & 0x8000); |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2508 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2509 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2510 /* 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
|
2511 Emacs uses. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2512 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2513 unsigned int |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2514 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
|
2515 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2516 Lisp_Object key_mapping; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2517 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2518 switch (key) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2519 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2520 case VK_LWIN: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2521 key_mapping = Vw32_lwindow_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2522 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2523 case VK_RWIN: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2524 key_mapping = Vw32_rwindow_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2525 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2526 case VK_APPS: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2527 key_mapping = Vw32_apps_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2528 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2529 case VK_SCROLL: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2530 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
|
2531 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2532 default: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2533 key_mapping = Qnil; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2534 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2535 |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2536 /* 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
|
2537 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
|
2538 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
|
2539 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
|
2540 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
|
2541 markbits here. */ |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2542 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
|
2543 return hyper_modifier; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2544 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
|
2545 return super_modifier; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2546 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
|
2547 return meta_modifier; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2548 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
|
2549 return alt_modifier; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2550 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
|
2551 return ctrl_modifier; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2552 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
|
2553 return ctrl_modifier; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2554 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
|
2555 return shift_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2556 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2557 /* 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
|
2558 return 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2559 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2560 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2561 unsigned int |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2562 w32_get_modifiers () |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2563 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2564 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
|
2565 (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
|
2566 (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
|
2567 (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
|
2568 (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
|
2569 (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
|
2570 (modifier_set (VK_MENU) ? |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2571 ((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
|
2572 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2573 |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2574 /* 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
|
2575 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
|
2576 and window input. */ |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2577 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2578 static int |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2579 construct_console_modifiers () |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2580 { |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2581 int mods; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2582 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2583 mods = 0; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2584 mods |= (modifier_set (VK_SHIFT)) ? SHIFT_PRESSED : 0; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2585 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
|
2586 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
|
2587 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
|
2588 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
|
2589 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
|
2590 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
|
2591 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
|
2592 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
|
2593 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
|
2594 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
|
2595 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2596 return mods; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2597 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2598 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2599 static int |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2600 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
|
2601 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2602 int mods; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2603 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2604 /* Convert to emacs modifiers. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2605 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
|
2606 |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2607 return mods; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2608 } |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
2609 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2610 unsigned int |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2611 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
|
2612 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2613 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
|
2614 return virt_key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2615 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2616 if (virt_key == VK_RETURN) |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
2617 return (extended ? VK_NUMPAD_ENTER : VK_RETURN); |
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
2618 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2619 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
|
2620 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
|
2621 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2622 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
|
2623 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
|
2624 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2625 if (virt_key == VK_CLEAR) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2626 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
|
2627 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2628 return virt_key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2629 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2630 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2631 /* 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
|
2632 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
|
2633 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
|
2634 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
|
2635 Lisp_Object w32_grabbed_keys; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2636 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2637 #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
|
2638 #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
|
2639 #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
|
2640 #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
|
2641 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2642 /* 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
|
2643 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
|
2644 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
|
2645 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2646 static void |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2647 register_hot_keys (hwnd) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2648 HWND hwnd; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2649 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2650 Lisp_Object keylist; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2651 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2652 /* 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
|
2653 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
|
2654 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2655 Lisp_Object key = XCAR (keylist); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2656 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2657 /* 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
|
2658 if (!INTEGERP (key)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2659 continue; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2660 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2661 RegisterHotKey (hwnd, HOTKEY_ID (key), |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2662 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
|
2663 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2664 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2665 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2666 static void |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2667 unregister_hot_keys (hwnd) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2668 HWND hwnd; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2669 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2670 Lisp_Object keylist; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2671 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2672 /* 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
|
2673 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
|
2674 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2675 Lisp_Object key = XCAR (keylist); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2676 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2677 if (!INTEGERP (key)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2678 continue; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2679 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2680 UnregisterHotKey (hwnd, HOTKEY_ID (key)); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2681 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2682 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2683 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2684 /* Main message dispatch loop. */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2685 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2686 static void |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2687 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
|
2688 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2689 MSG msg; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2690 int result; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2691 HWND focus_window; |
21874
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
2692 |
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
2693 msh_mousewheel = RegisterWindowMessage (MSH_MOUSEWHEEL); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2694 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2695 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
|
2696 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2697 if (msg.hwnd == NULL) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2698 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2699 switch (msg.message) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2700 { |
23950
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2701 case WM_NULL: |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2702 /* 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
|
2703 break; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2704 case WM_EMACS_CREATEWINDOW: |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2705 w32_createwindow ((struct frame *) msg.wParam); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2706 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
|
2707 abort (); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2708 break; |
21608
d191a8737145
(w32_msg_pump): Handle WM_EMACS_SETLOCALE.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19707
diff
changeset
|
2709 case WM_EMACS_SETLOCALE: |
d191a8737145
(w32_msg_pump): Handle WM_EMACS_SETLOCALE.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19707
diff
changeset
|
2710 SetThreadLocale (msg.wParam); |
d191a8737145
(w32_msg_pump): Handle WM_EMACS_SETLOCALE.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19707
diff
changeset
|
2711 /* Reply is not expected. */ |
d191a8737145
(w32_msg_pump): Handle WM_EMACS_SETLOCALE.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19707
diff
changeset
|
2712 break; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2713 case WM_EMACS_SETKEYBOARDLAYOUT: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2714 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
|
2715 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
|
2716 result, 0)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2717 abort (); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2718 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2719 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
|
2720 focus_window = GetFocus (); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2721 if (focus_window != NULL) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2722 RegisterHotKey (focus_window, |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2723 HOTKEY_ID (msg.wParam), |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2724 HOTKEY_MODIFIERS (msg.wParam), |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2725 HOTKEY_VK_CODE (msg.wParam)); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2726 /* Reply is not expected. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2727 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2728 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
|
2729 focus_window = GetFocus (); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2730 if (focus_window != NULL) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2731 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
|
2732 /* 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
|
2733 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
|
2734 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
|
2735 GC. */ |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39812
diff
changeset
|
2736 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
|
2737 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
|
2738 abort (); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
2739 break; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2740 case WM_EMACS_TOGGLE_LOCK_KEY: |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2741 { |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2742 int vk_code = (int) msg.wParam; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2743 int cur_state = (GetKeyState (vk_code) & 1); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2744 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
|
2745 |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2746 /* 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
|
2747 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
|
2748 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
|
2749 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
|
2750 immediate values. */ |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2751 if (NILP (new_state) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2752 || (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
|
2753 && ((XUINT (new_state)) & 1) != cur_state)) |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2754 { |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2755 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
|
2756 |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2757 keybd_event ((BYTE) vk_code, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2758 (BYTE) MapVirtualKey (vk_code, 0), |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2759 KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2760 keybd_event ((BYTE) vk_code, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2761 (BYTE) MapVirtualKey (vk_code, 0), |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2762 KEYEVENTF_EXTENDEDKEY | 0, 0); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2763 keybd_event ((BYTE) vk_code, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2764 (BYTE) MapVirtualKey (vk_code, 0), |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2765 KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2766 cur_state = !cur_state; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2767 } |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2768 if (!PostThreadMessage (dwMainThreadId, WM_EMACS_DONE, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2769 cur_state, 0)) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2770 abort (); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2771 } |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
2772 break; |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2773 default: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2774 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
|
2775 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2776 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2777 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2778 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2779 DispatchMessage (&msg); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2780 } |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2781 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2782 /* 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
|
2783 if (msg_buf->completed) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2784 break; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2785 } |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2786 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2787 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2788 deferred_msg * deferred_msg_head; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2789 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2790 static deferred_msg * |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2791 find_deferred_msg (HWND hwnd, UINT msg) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2792 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2793 deferred_msg * item; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2794 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2795 /* 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
|
2796 modification of single pointer is always atomic. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2797 /* enter_crit (); */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2798 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2799 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
|
2800 if (item->w32msg.msg.hwnd == hwnd |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2801 && item->w32msg.msg.message == msg) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2802 break; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2803 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2804 /* leave_crit (); */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2805 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2806 return item; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2807 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2808 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2809 static LRESULT |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2810 send_deferred_msg (deferred_msg * msg_buf, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2811 HWND hwnd, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2812 UINT msg, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2813 WPARAM wParam, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2814 LPARAM lParam) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2815 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2816 /* Only input thread can send deferred messages. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2817 if (GetCurrentThreadId () != dwWindowsThreadId) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2818 abort (); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2819 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2820 /* 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
|
2821 if (find_deferred_msg (hwnd, msg) != NULL) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2822 abort (); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2823 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2824 /* 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
|
2825 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
|
2826 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
|
2827 input thread can call us). */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2828 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2829 /* enter_crit (); */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2830 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2831 msg_buf->completed = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2832 msg_buf->next = deferred_msg_head; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2833 deferred_msg_head = msg_buf; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2834 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
|
2835 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2836 /* leave_crit (); */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2837 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2838 /* 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
|
2839 this one is completed. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2840 w32_msg_pump (msg_buf); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2841 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2842 deferred_msg_head = msg_buf->next; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2843 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2844 return msg_buf->result; |
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 void |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2848 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
|
2849 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2850 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
|
2851 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2852 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
|
2853 /* 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
|
2854 return; |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2855 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2856 msg_buf->result = result; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2857 msg_buf->completed = 1; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2858 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2859 /* 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
|
2860 PostThreadMessage (dwWindowsThreadId, WM_NULL, 0, 0); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2861 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2862 |
23950
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2863 void |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2864 cancel_all_deferred_msgs () |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2865 { |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2866 deferred_msg * item; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2867 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2868 /* 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
|
2869 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
|
2870 /* enter_crit (); */ |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2871 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2872 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
|
2873 { |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2874 item->result = 0; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2875 item->completed = 1; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2876 } |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2877 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2878 /* leave_crit (); */ |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2879 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2880 /* 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
|
2881 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
|
2882 } |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2883 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2884 DWORD |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2885 w32_msg_worker (dw) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2886 DWORD dw; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2887 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2888 MSG msg; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2889 deferred_msg dummy_buf; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2890 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2891 /* Ensure our message queue is created */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2892 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2893 PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2894 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2895 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
|
2896 abort (); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2897 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2898 memset (&dummy_buf, 0, sizeof (dummy_buf)); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2899 dummy_buf.w32msg.msg.hwnd = NULL; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2900 dummy_buf.w32msg.msg.message = WM_NULL; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2901 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2902 /* 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
|
2903 application quits. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2904 w32_msg_pump (&dummy_buf); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2905 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
2906 return 0; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2907 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
2908 |
23950
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2909 static void |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2910 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
|
2911 HWND hwnd; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2912 UINT msg; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2913 WPARAM wParam; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2914 LPARAM lParam; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2915 DWORD modifiers; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2916 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2917 { |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2918 W32Msg wmsg; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2919 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2920 wmsg.dwModifiers = modifiers; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2921 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2922 /* 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
|
2923 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
|
2924 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
|
2925 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
|
2926 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
|
2927 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
|
2928 { |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2929 int c = wParam; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2930 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
|
2931 c = make_ctrl_char (c) & 0377; |
24339
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
2932 if (c == quit_char |
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
2933 || (wmsg.dwModifiers == 0 && |
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
2934 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
|
2935 { |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2936 Vquit_flag = Qt; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2937 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2938 /* 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
|
2939 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
|
2940 msg = WM_NULL; |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2941 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2942 /* 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
|
2943 signal_quit (); |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2944 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2945 /* 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
|
2946 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
|
2947 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
|
2948 "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
|
2949 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
|
2950 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
|
2951 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
|
2952 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
|
2953 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
|
2954 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
|
2955 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
|
2956 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
|
2957 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
|
2958 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
|
2959 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2960 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
|
2961 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
|
2962 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
|
2963 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
|
2964 cancel_all_deferred_msgs (); |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2965 } |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2966 } |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2967 |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2968 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
|
2969 } |
d8f8533db4cc
(w32_msg_pump): Ignore WM_NULL message posted to thread
Andrew Innes <andrewi@gnu.org>
parents:
23803
diff
changeset
|
2970 |
13434 | 2971 /* Main window procedure */ |
2972 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2973 LRESULT CALLBACK |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2974 w32_wnd_proc (hwnd, msg, wParam, lParam) |
13434 | 2975 HWND hwnd; |
2976 UINT msg; | |
2977 WPARAM wParam; | |
2978 LPARAM lParam; | |
2979 { | |
2980 struct frame *f; | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
2981 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
|
2982 W32Msg wmsg; |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
2983 int windows_translate; |
24206
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
2984 int key; |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
2985 |
15650
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
2986 /* 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
|
2987 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
|
2988 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
|
2989 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
|
2990 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
|
2991 |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
2992 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
|
2993 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
|
2994 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
|
2995 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
|
2996 delete-frame has synchronized with this thread. |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
2997 |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
2998 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
|
2999 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
|
3000 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
|
3001 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3002 switch (msg) |
13434 | 3003 { |
3004 case WM_ERASEBKGND: | |
15650
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
3005 f = x_window_to_frame (dpyinfo, hwnd); |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
3006 if (f) |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
3007 { |
27407
7df920562cbe
(w32_defined_color): Apply gamma correction before trying to map to
Jason Rumney <jasonr@gnu.org>
parents:
27397
diff
changeset
|
3008 HDC hdc = get_frame_dc (f); |
15650
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
3009 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
|
3010 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
|
3011 release_frame_dc (f, hdc); |
24718
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3012 |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3013 #if defined (W32_DEBUG_DISPLAY) |
39128
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
3014 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
|
3015 f, |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
3016 wmsg.rect.left, wmsg.rect.top, |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
3017 wmsg.rect.right, wmsg.rect.bottom)); |
24718
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3018 #endif /* W32_DEBUG_DISPLAY */ |
15650
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
3019 } |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3020 return 1; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3021 case WM_PALETTECHANGED: |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3022 /* ignore our own changes */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3023 if ((HWND)wParam != hwnd) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3024 { |
15650
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
3025 f = x_window_to_frame (dpyinfo, hwnd); |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
3026 if (f) |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
3027 /* 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
|
3028 frames to be redrawn if needed. */ |
bc9525478463
(win32_wnd_proc): Handle WM_ERASEBKGND and
Karl Heuer <kwzh@gnu.org>
parents:
15459
diff
changeset
|
3029 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
|
3030 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3031 return 0; |
13434 | 3032 case WM_PAINT: |
24718
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3033 { |
24670 | 3034 PAINTSTRUCT paintStruct; |
3035 RECT update_rect; | |
42935
20a21fb23284
(w32_wnd_proc) <WM_PAINT>: Initialize update_rect.
Jason Rumney <jasonr@gnu.org>
parents:
42918
diff
changeset
|
3036 bzero (&update_rect, sizeof (update_rect)); |
24670 | 3037 |
39128
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
3038 f = x_window_to_frame (dpyinfo, hwnd); |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
3039 if (f == 0) |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
3040 { |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
3041 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
|
3042 return 0; |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
3043 } |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
3044 |
24670 | 3045 /* MSDN Docs say not to call BeginPaint if GetUpdateRect |
3046 fails. Apparently this can happen under some | |
3047 circumstances. */ | |
42935
20a21fb23284
(w32_wnd_proc) <WM_PAINT>: Initialize update_rect.
Jason Rumney <jasonr@gnu.org>
parents:
42918
diff
changeset
|
3048 if (GetUpdateRect (hwnd, &update_rect, FALSE) || !w32_strict_painting) |
24670 | 3049 { |
3050 enter_crit (); | |
3051 BeginPaint (hwnd, &paintStruct); | |
3052 | |
42935
20a21fb23284
(w32_wnd_proc) <WM_PAINT>: Initialize update_rect.
Jason Rumney <jasonr@gnu.org>
parents:
42918
diff
changeset
|
3053 /* 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
|
3054 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
|
3055 are invalid. */ |
20a21fb23284
(w32_wnd_proc) <WM_PAINT>: Initialize update_rect.
Jason Rumney <jasonr@gnu.org>
parents:
42918
diff
changeset
|
3056 UnionRect (&(wmsg.rect), &update_rect, &(paintStruct.rcPaint)); |
24670 | 3057 |
3058 #if defined (W32_DEBUG_DISPLAY) | |
39128
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
3059 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
|
3060 f, |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
3061 wmsg.rect.left, wmsg.rect.top, |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
3062 wmsg.rect.right, wmsg.rect.bottom)); |
42efaa34094a
(w32_createwindow): Remove the WS_CLIPCHILDREN style
Andrew Innes <andrewi@gnu.org>
parents:
37707
diff
changeset
|
3063 DebPrint ((" [update region is %d,%d-%d,%d]\n", |
24670 | 3064 update_rect.left, update_rect.top, |
3065 update_rect.right, update_rect.bottom)); | |
3066 #endif | |
3067 EndPaint (hwnd, &paintStruct); | |
3068 leave_crit (); | |
3069 | |
3070 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3071 |
24670 | 3072 return 0; |
3073 } | |
24695
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
3074 |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
3075 /* If GetUpdateRect returns 0 (meaning there is no update |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
3076 region), assume the whole window needs to be repainted. */ |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
3077 GetClientRect(hwnd, &wmsg.rect); |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
3078 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
3079 return 0; |
13434 | 3080 } |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3081 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3082 case WM_INPUTLANGCHANGE: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3083 /* 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
|
3084 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
|
3085 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3086 /* 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
|
3087 preserve modifier key states. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3088 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3089 int i; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3090 BYTE keystate[256]; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3091 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3092 GetKeyboardState (keystate); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3093 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
|
3094 if (1 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3095 && i != VK_SHIFT |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3096 && i != VK_LSHIFT |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3097 && i != VK_RSHIFT |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3098 && i != VK_CAPITAL |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3099 && i != VK_NUMLOCK |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3100 && i != VK_SCROLL |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3101 && i != VK_CONTROL |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3102 && i != VK_LCONTROL |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3103 && i != VK_RCONTROL |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3104 && i != VK_MENU |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3105 && i != VK_LMENU |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3106 && i != VK_RMENU |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3107 && i != VK_LWIN |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3108 && i != VK_RWIN) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3109 keystate[i] = 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3110 SetKeyboardState (keystate); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3111 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3112 goto dflt; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3113 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3114 case WM_HOTKEY: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3115 /* 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
|
3116 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
|
3117 return (0); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3118 |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3119 case WM_KEYUP: |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3120 case WM_SYSKEYUP: |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3121 record_keyup (wParam, lParam); |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3122 goto dflt; |
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3123 |
13434 | 3124 case WM_KEYDOWN: |
3125 case WM_SYSKEYDOWN: | |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3126 /* 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
|
3127 if (dpyinfo->faked_key == wParam) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3128 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3129 dpyinfo->faked_key = 0; |
24206
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
3130 /* 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
|
3131 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
|
3132 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
|
3133 example. */ |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
3134 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
|
3135 { |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
3136 windows_translate = 1; |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
3137 goto translate; |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
3138 } |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
3139 return 0; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3140 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3141 |
15377
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3142 /* Synchronize modifiers with current keystroke. */ |
65d9ff2c8602
(sync_modifiers): New function.
Richard M. Stallman <rms@gnu.org>
parents:
15314
diff
changeset
|
3143 sync_modifiers (); |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3144 record_keydown (wParam, lParam); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3145 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
|
3146 |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3147 windows_translate = 0; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3148 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3149 switch (wParam) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3150 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3151 case VK_LWIN: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3152 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
|
3153 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3154 /* 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
|
3155 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
|
3156 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
|
3157 if (GetAsyncKeyState (wParam) & 1) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3158 { |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3159 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
|
3160 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
|
3161 else |
24206
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
3162 key = VK_SPACE; |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
3163 dpyinfo->faked_key = key; |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
3164 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
|
3165 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3166 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3167 if (!NILP (Vw32_lwindow_modifier)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3168 return 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3169 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3170 case VK_RWIN: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3171 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
|
3172 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3173 if (GetAsyncKeyState (wParam) & 1) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3174 { |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3175 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
|
3176 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
|
3177 else |
24206
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
3178 key = VK_SPACE; |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
3179 dpyinfo->faked_key = key; |
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
3180 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
|
3181 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3182 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3183 if (!NILP (Vw32_rwindow_modifier)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3184 return 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3185 break; |
24206
d3649b38bb37
(w32_wnd_proc): Fix bug introduced by previous change;
Andrew Innes <andrewi@gnu.org>
parents:
24147
diff
changeset
|
3186 case VK_APPS: |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3187 if (!NILP (Vw32_apps_modifier)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3188 return 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3189 break; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3190 case VK_MENU: |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3191 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
|
3192 /* 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
|
3193 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
|
3194 return 0; |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3195 windows_translate = 1; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3196 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3197 case VK_CAPITAL: |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3198 /* 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
|
3199 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
|
3200 goto disable_lock_key; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3201 windows_translate = 1; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3202 break; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3203 case VK_NUMLOCK: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3204 /* 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
|
3205 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
|
3206 goto disable_lock_key; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3207 windows_translate = 1; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3208 break; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3209 case VK_SCROLL: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3210 /* 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
|
3211 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
|
3212 goto disable_lock_key; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3213 windows_translate = 1; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3214 break; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3215 disable_lock_key: |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3216 /* 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
|
3217 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
|
3218 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
|
3219 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
|
3220 dpyinfo->faked_key = wParam; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3221 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
|
3222 KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3223 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
|
3224 KEYEVENTF_EXTENDEDKEY | 0, 0); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3225 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
|
3226 KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3227 /* 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
|
3228 (TranslateMessage apparently does this), after forwarding |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3229 input event. */ |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3230 post_character_message (hwnd, msg, wParam, lParam, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3231 w32_get_key_modifiers (wParam, lParam)); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3232 windows_translate = 1; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3233 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3234 case VK_CONTROL: |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3235 case VK_SHIFT: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3236 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
|
3237 windows_translate = 1; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3238 break; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3239 case VK_CANCEL: |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3240 /* 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
|
3241 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
|
3242 VK_CANCEL events into VK_PAUSE events. */ |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3243 wParam = VK_PAUSE; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3244 break; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3245 case VK_PAUSE: |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3246 /* 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
|
3247 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
|
3248 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
|
3249 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
|
3250 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
|
3251 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
|
3252 wParam = VK_NUMLOCK; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3253 break; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3254 default: |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3255 /* 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
|
3256 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
|
3257 { |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3258 DWORD modifiers = construct_console_modifiers (); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3259 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3260 if (!NILP (Vw32_recognize_altgr) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3261 && 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
|
3262 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3263 /* 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
|
3264 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
|
3265 chords correctly. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3266 windows_translate = 1; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3267 } |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3268 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
|
3269 { |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3270 /* Handle key chords including any modifiers other |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3271 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
|
3272 modifier information as possible. */ |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3273 if ('A' <= wParam && wParam <= 'Z') |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3274 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3275 /* 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
|
3276 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
|
3277 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
|
3278 the normal layout translates alphabetic |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3279 characters to non-ascii characters. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3280 if (!modifier_set (VK_SHIFT)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3281 wParam += ('a' - 'A'); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3282 msg = WM_CHAR; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3283 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3284 else |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3285 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3286 /* 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
|
3287 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
|
3288 shift modifier). */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3289 int add; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3290 int isdead = 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3291 KEY_EVENT_RECORD key; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3292 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3293 key.bKeyDown = TRUE; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3294 key.wRepeatCount = 1; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3295 key.wVirtualKeyCode = wParam; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3296 key.wVirtualScanCode = (lParam & 0xFF0000) >> 16; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3297 key.uChar.AsciiChar = 0; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3298 key.dwControlKeyState = modifiers; |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3299 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3300 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
|
3301 /* 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
|
3302 dead key. Ignore both. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3303 while (--add >= 0) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3304 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3305 /* Forward asciified character sequence. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3306 post_character_message |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3307 (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
|
3308 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
|
3309 w32_kbd_patch_key (&key); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3310 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3311 return 0; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3312 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3313 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3314 else |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3315 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3316 /* Let TranslateMessage handle everything else. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3317 windows_translate = 1; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3318 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3319 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3320 } |
14461
4fe9540be594
(modifiers, modifier_key_support_tested,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14353
diff
changeset
|
3321 |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3322 translate: |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3323 if (windows_translate) |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3324 { |
16884
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16602
diff
changeset
|
3325 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
|
3326 |
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16602
diff
changeset
|
3327 windows_msg.time = GetMessageTime (); |
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16602
diff
changeset
|
3328 TranslateMessage (&windows_msg); |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3329 goto dflt; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3330 } |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3331 |
13434 | 3332 /* Fall through */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3333 |
13434 | 3334 case WM_SYSCHAR: |
3335 case WM_CHAR: | |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3336 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
|
3337 w32_get_key_modifiers (wParam, lParam)); |
13434 | 3338 break; |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
3339 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3340 /* 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
|
3341 are used together, but only if user has two button mouse. */ |
13434 | 3342 case WM_LBUTTONDOWN: |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3343 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
|
3344 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
|
3345 goto handle_plain_button; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3346 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3347 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3348 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
|
3349 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
|
3350 |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
3351 if (button_state & this) |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
3352 return 0; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3353 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3354 if (button_state == 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3355 SetCapture (hwnd); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3356 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3357 button_state |= this; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3358 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3359 if (button_state & other) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3360 { |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3361 if (mouse_button_timer) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3362 { |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3363 KillTimer (hwnd, mouse_button_timer); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3364 mouse_button_timer = 0; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3365 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3366 /* Generate middle mouse event instead. */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3367 msg = WM_MBUTTONDOWN; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3368 button_state |= MMOUSE; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3369 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3370 else if (button_state & MMOUSE) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3371 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3372 /* 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
|
3373 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
|
3374 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
|
3375 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
|
3376 return 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3377 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3378 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3379 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3380 /* Flush out saved message. */ |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3381 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
|
3382 } |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3383 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
|
3384 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
|
3385 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3386 /* Clear message buffer. */ |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3387 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
|
3388 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3389 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3390 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3391 /* Hold onto message for now. */ |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3392 mouse_button_timer = |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3393 SetTimer (hwnd, MOUSE_BUTTON_ID, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3394 XINT (Vw32_mouse_button_tolerance), NULL); |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3395 saved_mouse_button_msg.msg.hwnd = hwnd; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3396 saved_mouse_button_msg.msg.message = msg; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3397 saved_mouse_button_msg.msg.wParam = wParam; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3398 saved_mouse_button_msg.msg.lParam = lParam; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3399 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
|
3400 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
|
3401 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3402 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3403 return 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3404 |
13434 | 3405 case WM_LBUTTONUP: |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3406 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
|
3407 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
|
3408 goto handle_plain_button; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3409 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3410 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3411 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
|
3412 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
|
3413 |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
3414 if ((button_state & this) == 0) |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
3415 return 0; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3416 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3417 button_state &= ~this; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3418 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3419 if (button_state & MMOUSE) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3420 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3421 /* 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
|
3422 if ((button_state & other) == 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3423 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3424 msg = WM_MBUTTONUP; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3425 button_state &= ~MMOUSE; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3426 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3427 if (button_state) abort (); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3428 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3429 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3430 return 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3431 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3432 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3433 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3434 /* Flush out saved message if necessary. */ |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3435 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
|
3436 { |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3437 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
|
3438 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3439 } |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3440 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
|
3441 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
|
3442 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3443 /* 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
|
3444 saved_mouse_button_msg.msg.hwnd = 0; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3445 KillTimer (hwnd, mouse_button_timer); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3446 mouse_button_timer = 0; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3447 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3448 if (button_state == 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3449 ReleaseCapture (); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3450 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3451 return 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3452 |
42719
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
3453 case WM_XBUTTONDOWN: |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
3454 case WM_XBUTTONUP: |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
3455 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
|
3456 goto dflt; |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
3457 /* else fall through and process them. */ |
13434 | 3458 case WM_MBUTTONDOWN: |
3459 case WM_MBUTTONUP: | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3460 handle_plain_button: |
13434 | 3461 { |
3462 BOOL up; | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3463 int button; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3464 |
42719
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
3465 if (parse_button (msg, HIWORD (wParam), &button, &up)) |
13434 | 3466 { |
3467 if (up) ReleaseCapture (); | |
3468 else SetCapture (hwnd); | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3469 button = (button == 0) ? LMOUSE : |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3470 ((button == 1) ? MMOUSE : RMOUSE); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3471 if (up) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3472 button_state &= ~button; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3473 else |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3474 button_state |= button; |
13434 | 3475 } |
3476 } | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3477 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3478 wmsg.dwModifiers = w32_get_modifiers (); |
13434 | 3479 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
|
3480 |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
3481 /* 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
|
3482 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
|
3483 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
|
3484 |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
3485 case WM_MOUSEMOVE: |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
3486 /* 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
|
3487 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
|
3488 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
|
3489 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
|
3490 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
|
3491 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
|
3492 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
|
3493 { |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
3494 TRACKMOUSEEVENT tme; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
3495 tme.cbSize = sizeof (tme); |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
3496 tme.dwFlags = TME_LEAVE; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
3497 tme.hwndTrack = hwnd; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
3498 |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
3499 track_mouse_event_fn (&tme); |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
3500 track_mouse_window = hwnd; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
3501 } |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3502 case WM_VSCROLL: |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3503 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
|
3504 || (msg == WM_MOUSEMOVE && button_state == 0)) |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3505 { |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3506 wmsg.dwModifiers = w32_get_modifiers (); |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3507 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
|
3508 return 0; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3509 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3510 |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3511 /* 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
|
3512 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
|
3513 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
|
3514 expires, we just replace the first message. */ |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3515 |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3516 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
|
3517 mouse_move_timer = |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3518 SetTimer (hwnd, MOUSE_MOVE_ID, |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3519 XINT (Vw32_mouse_move_interval), NULL); |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3520 |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3521 /* Hold onto message for now. */ |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3522 saved_mouse_move_msg.msg.hwnd = hwnd; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3523 saved_mouse_move_msg.msg.message = msg; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3524 saved_mouse_move_msg.msg.wParam = wParam; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3525 saved_mouse_move_msg.msg.lParam = lParam; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3526 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
|
3527 saved_mouse_move_msg.dwModifiers = w32_get_modifiers (); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3528 |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3529 return 0; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3530 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3531 case WM_MOUSEWHEEL: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3532 wmsg.dwModifiers = w32_get_modifiers (); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3533 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
|
3534 return 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3535 |
21884 | 3536 case WM_DROPFILES: |
3537 wmsg.dwModifiers = w32_get_modifiers (); | |
3538 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); | |
3539 return 0; | |
3540 | |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3541 case WM_TIMER: |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3542 /* Flush out saved messages if necessary. */ |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3543 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
|
3544 { |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3545 if (saved_mouse_button_msg.msg.hwnd) |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3546 { |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3547 post_msg (&saved_mouse_button_msg); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3548 saved_mouse_button_msg.msg.hwnd = 0; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3549 } |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3550 KillTimer (hwnd, mouse_button_timer); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3551 mouse_button_timer = 0; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3552 } |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3553 else if (wParam == mouse_move_timer) |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3554 { |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3555 if (saved_mouse_move_msg.msg.hwnd) |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3556 { |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3557 post_msg (&saved_mouse_move_msg); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3558 saved_mouse_move_msg.msg.hwnd = 0; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3559 } |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3560 KillTimer (hwnd, mouse_move_timer); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3561 mouse_move_timer = 0; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3562 } |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3563 else if (wParam == menu_free_timer) |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3564 { |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3565 KillTimer (hwnd, menu_free_timer); |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3566 menu_free_timer = 0; |
43484
a3cecd273126
(w32_wnd_proc) <WM_TIMER>: Fix last change.
Jason Rumney <jasonr@gnu.org>
parents:
43472
diff
changeset
|
3567 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
|
3568 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
|
3569 { |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3570 /* 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
|
3571 w32_free_menu_strings (hwnd); |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3572 f->output_data.w32->menubar_active = 0; |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3573 } |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3574 } |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3575 return 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3576 |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3577 case WM_NCACTIVATE: |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3578 /* 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
|
3579 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
|
3580 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
|
3581 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
|
3582 keyboard modifiers' state. */ |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3583 reset_modifiers (); |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3584 goto dflt; |
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
3585 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3586 case WM_INITMENU: |
24751
e0eaca5025bc
(w32_wnd_proc): Ensure mouse capture is released if
Andrew Innes <andrewi@gnu.org>
parents:
24718
diff
changeset
|
3587 button_state = 0; |
e0eaca5025bc
(w32_wnd_proc): Ensure mouse capture is released if
Andrew Innes <andrewi@gnu.org>
parents:
24718
diff
changeset
|
3588 ReleaseCapture (); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3589 /* 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
|
3590 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
|
3591 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
|
3592 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
|
3593 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
|
3594 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3595 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
|
3596 loop that can process all other messages. |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3597 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3598 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
|
3599 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
|
3600 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
|
3601 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
|
3602 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
|
3603 being active). */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3604 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3605 f = x_window_to_frame (dpyinfo, hwnd); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3606 if (f |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3607 && (f->output_data.w32->menubar_active |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3608 /* 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
|
3609 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
|
3610 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
|
3611 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
|
3612 had requested it to be turned off! */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3613 || f->output_data.w32->menubar_widget == NULL)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3614 return 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3615 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3616 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3617 deferred_msg msg_buf; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3618 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3619 /* 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
|
3620 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
|
3621 if (find_deferred_msg (hwnd, msg) != NULL) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3622 abort (); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3623 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3624 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
|
3625 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3626 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3627 case WM_EXITMENULOOP: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3628 f = x_window_to_frame (dpyinfo, hwnd); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3629 |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3630 /* 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
|
3631 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
|
3632 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
|
3633 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
|
3634 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
|
3635 goto dflt; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3636 |
28272
f62bb21d38db
(w32_wnd_proc): Handle WM_MENUSELECT message.
Jason Rumney <jasonr@gnu.org>
parents:
27936
diff
changeset
|
3637 case WM_MENUSELECT: |
41638
aadcf676d5de
(w32_wnd_proc) <WM_MENUSELECT>: Display help directly.
Jason Rumney <jasonr@gnu.org>
parents:
41480
diff
changeset
|
3638 /* 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
|
3639 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
|
3640 keyboard buffer. */ |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
3641 { |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
3642 HMENU menu = (HMENU) lParam; |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
3643 UINT menu_item = (UINT) LOWORD (wParam); |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
3644 UINT flags = (UINT) HIWORD (wParam); |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
3645 |
41638
aadcf676d5de
(w32_wnd_proc) <WM_MENUSELECT>: Display help directly.
Jason Rumney <jasonr@gnu.org>
parents:
41480
diff
changeset
|
3646 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
|
3647 } |
28272
f62bb21d38db
(w32_wnd_proc): Handle WM_MENUSELECT message.
Jason Rumney <jasonr@gnu.org>
parents:
27936
diff
changeset
|
3648 return 0; |
f62bb21d38db
(w32_wnd_proc): Handle WM_MENUSELECT message.
Jason Rumney <jasonr@gnu.org>
parents:
27936
diff
changeset
|
3649 |
21735
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3650 case WM_MEASUREITEM: |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3651 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
|
3652 if (f) |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3653 { |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3654 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
|
3655 |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3656 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
|
3657 { |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3658 /* 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
|
3659 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
|
3660 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
|
3661 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
|
3662 LOGFONT menu_logfont; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3663 HFONT old_font; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3664 SIZE size; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3665 |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3666 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
|
3667 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
|
3668 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
|
3669 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
|
3670 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
3671 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
|
3672 if (title) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
3673 { |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
3674 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
|
3675 pMis->itemWidth = size.cx; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
3676 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
|
3677 pMis->itemHeight = size.cy; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
3678 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
3679 else |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
3680 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
|
3681 |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3682 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
|
3683 DeleteObject (menu_font); |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3684 ReleaseDC (hwnd, hdc); |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3685 return TRUE; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3686 } |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3687 } |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3688 return 0; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3689 |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3690 case WM_DRAWITEM: |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3691 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
|
3692 if (f) |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3693 { |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3694 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
|
3695 |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3696 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
|
3697 { |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3698 /* 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
|
3699 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
|
3700 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
|
3701 { |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
3702 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
|
3703 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
|
3704 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
|
3705 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
|
3706 |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
3707 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
|
3708 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
|
3709 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
|
3710 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
|
3711 |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
3712 /* 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
|
3713 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
|
3714 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
|
3715 + 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
|
3716 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
|
3717 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
|
3718 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
|
3719 |
6a55bd8a85f8
(w32_wnd_proc) [WM_DRAW_ITEM]: Do not try to draw a null title.
Jason Rumney <jasonr@gnu.org>
parents:
29317
diff
changeset
|
3720 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
|
3721 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
|
3722 } |
21735
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3723 return TRUE; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3724 } |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3725 } |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3726 return 0; |
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3727 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3728 #if 0 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3729 /* 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
|
3730 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
|
3731 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
|
3732 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
|
3733 case WM_MOUSEACTIVATE: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3734 /* 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
|
3735 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
|
3736 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
|
3737 if (LOWORD (lParam) == HTCLIENT ) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3738 return MA_ACTIVATEANDEAT; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3739 goto dflt; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3740 #endif |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3741 |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
3742 case WM_MOUSELEAVE: |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
3743 /* No longer tracking mouse. */ |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
3744 track_mouse_window = NULL; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
3745 |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3746 case WM_ACTIVATEAPP: |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3747 case WM_ACTIVATE: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3748 case WM_WINDOWPOSCHANGED: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3749 case WM_SHOWWINDOW: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3750 /* 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
|
3751 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
|
3752 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
|
3753 goto dflt; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3754 |
14810
4dd6867765b9
(Vwin32_pass_alt_to_system,
Geoff Voelker <voelker@cs.washington.edu>
parents:
14461
diff
changeset
|
3755 case WM_SETFOCUS: |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3756 dpyinfo->faked_key = 0; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
3757 reset_modifiers (); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3758 register_hot_keys (hwnd); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3759 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
|
3760 case WM_KILLFOCUS: |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3761 unregister_hot_keys (hwnd); |
24751
e0eaca5025bc
(w32_wnd_proc): Ensure mouse capture is released if
Andrew Innes <andrewi@gnu.org>
parents:
24718
diff
changeset
|
3762 button_state = 0; |
e0eaca5025bc
(w32_wnd_proc): Ensure mouse capture is released if
Andrew Innes <andrewi@gnu.org>
parents:
24718
diff
changeset
|
3763 ReleaseCapture (); |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
3764 /* Relinquish the system caret. */ |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
3765 if (w32_system_caret_hwnd) |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
3766 { |
42918
9b06036a8c5e
(syms_of_w32fns): Initialize w32_visible_system_caret_hwnd.
Jason Rumney <jasonr@gnu.org>
parents:
42865
diff
changeset
|
3767 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
|
3768 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
|
3769 DestroyCaret (); |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
3770 } |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3771 goto command; |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3772 case WM_COMMAND: |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3773 f = x_window_to_frame (dpyinfo, hwnd); |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3774 if (f && HIWORD (wParam) == 0) |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3775 { |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3776 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
|
3777 if (menu_free_timer) |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3778 { |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3779 KillTimer (hwnd, menu_free_timer); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3780 menu_free_timer = 0; |
43472
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3781 } |
7faac536665f
(mouse_move_timer, mouse_button_timer): Initialize.
Jason Rumney <jasonr@gnu.org>
parents:
43398
diff
changeset
|
3782 } |
13434 | 3783 case WM_MOVE: |
3784 case WM_SIZE: | |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
3785 command: |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3786 wmsg.dwModifiers = w32_get_modifiers (); |
13434 | 3787 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
3788 goto dflt; | |
15034
fb947ec168a8
(defined_color): Map color to nearest in default palette.
Richard M. Stallman <rms@gnu.org>
parents:
14983
diff
changeset
|
3789 |
fb947ec168a8
(defined_color): Map color to nearest in default palette.
Richard M. Stallman <rms@gnu.org>
parents:
14983
diff
changeset
|
3790 case WM_CLOSE: |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
3791 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
|
3792 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
|
3793 return 0; |
fb947ec168a8
(defined_color): Map color to nearest in default palette.
Richard M. Stallman <rms@gnu.org>
parents:
14983
diff
changeset
|
3794 |
13434 | 3795 case WM_WINDOWPOSCHANGING: |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
3796 /* 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
|
3797 if (hwnd == tip_window) |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
3798 return 0; |
13434 | 3799 { |
3800 WINDOWPLACEMENT wp; | |
3801 LPWINDOWPOS lppos = (WINDOWPOS *) lParam; | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3802 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3803 wp.length = sizeof (WINDOWPLACEMENT); |
13434 | 3804 GetWindowPlacement (hwnd, &wp); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3805 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3806 if (wp.showCmd != SW_SHOWMINIMIZED && (lppos->flags & SWP_NOSIZE) == 0) |
13434 | 3807 { |
3808 RECT rect; | |
3809 int wdiff; | |
3810 int hdiff; | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3811 DWORD font_width; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3812 DWORD line_height; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3813 DWORD internal_border; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3814 DWORD scrollbar_extra; |
13434 | 3815 RECT wr; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3816 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3817 wp.length = sizeof(wp); |
13434 | 3818 GetWindowRect (hwnd, &wr); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3819 |
14353 | 3820 enter_crit (); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3821 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3822 font_width = GetWindowLong (hwnd, WND_FONTWIDTH_INDEX); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3823 line_height = GetWindowLong (hwnd, WND_LINEHEIGHT_INDEX); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3824 internal_border = GetWindowLong (hwnd, WND_BORDER_INDEX); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3825 scrollbar_extra = GetWindowLong (hwnd, WND_SCROLLBAR_INDEX); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3826 |
14353 | 3827 leave_crit (); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3828 |
13434 | 3829 memset (&rect, 0, sizeof (rect)); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3830 AdjustWindowRect (&rect, GetWindowLong (hwnd, GWL_STYLE), |
13434 | 3831 GetMenu (hwnd) != NULL); |
3832 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3833 /* 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
|
3834 multiples of the character cell dimensions. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3835 wdiff = (lppos->cx - (rect.right - rect.left) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3836 - 2 * internal_border - scrollbar_extra) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3837 % font_width; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3838 hdiff = (lppos->cy - (rect.bottom - rect.top) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3839 - 2 * internal_border) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3840 % line_height; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3841 |
13434 | 3842 if (wdiff || hdiff) |
3843 { | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3844 /* For right/bottom sizing we can just fix the sizes. |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3845 However for top/left sizing we will need to fix the X |
13434 | 3846 and Y positions as well. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3847 |
13434 | 3848 lppos->cx -= wdiff; |
3849 lppos->cy -= hdiff; | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3850 |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3851 if (wp.showCmd != SW_SHOWMAXIMIZED |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3852 && (lppos->flags & SWP_NOMOVE) == 0) |
13434 | 3853 { |
3854 if (lppos->x != wr.left || lppos->y != wr.top) | |
3855 { | |
3856 lppos->x += wdiff; | |
3857 lppos->y += hdiff; | |
3858 } | |
3859 else | |
3860 { | |
3861 lppos->flags |= SWP_NOMOVE; | |
3862 } | |
3863 } | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3864 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3865 return 0; |
13434 | 3866 } |
3867 } | |
3868 } | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3869 |
13434 | 3870 goto dflt; |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3871 |
24479
3b2c3636bf0e
(w32_wnd_proc): Handle WM_GETMINMAXINFO message.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24412
diff
changeset
|
3872 case WM_GETMINMAXINFO: |
3b2c3636bf0e
(w32_wnd_proc): Handle WM_GETMINMAXINFO message.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24412
diff
changeset
|
3873 /* 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
|
3874 below the Minimum Tracking Size. */ |
3b2c3636bf0e
(w32_wnd_proc): Handle WM_GETMINMAXINFO message.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24412
diff
changeset
|
3875 ((LPMINMAXINFO) lParam)->ptMinTrackSize.y++; |
36080
743534626f73
(w32_wnd_proc) <WM_GETMINMAXINFO>: Allow resizing the
Andrew Innes <andrewi@gnu.org>
parents:
36000
diff
changeset
|
3876 /* 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
|
3877 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
|
3878 ((LPMINMAXINFO) lParam)->ptMaxTrackSize.x = 32767; |
743534626f73
(w32_wnd_proc) <WM_GETMINMAXINFO>: Allow resizing the
Andrew Innes <andrewi@gnu.org>
parents:
36000
diff
changeset
|
3879 ((LPMINMAXINFO) lParam)->ptMaxTrackSize.y = 32767; |
24479
3b2c3636bf0e
(w32_wnd_proc): Handle WM_GETMINMAXINFO message.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24412
diff
changeset
|
3880 return 0; |
3b2c3636bf0e
(w32_wnd_proc): Handle WM_GETMINMAXINFO message.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24412
diff
changeset
|
3881 |
49369
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
3882 case WM_SETCURSOR: |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
3883 if (LOWORD (lParam) == HTCLIENT) |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
3884 return 0; |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
3885 |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
3886 goto dflt; |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
3887 |
49369
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
3888 case WM_EMACS_SETCURSOR: |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
3889 { |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
3890 Cursor cursor = (Cursor) wParam; |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
3891 if (cursor) |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
3892 SetCursor (cursor); |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
3893 return 0; |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
3894 } |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
3895 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3896 case WM_EMACS_CREATESCROLLBAR: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3897 return (LRESULT) w32_createscrollbar ((struct frame *) wParam, |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3898 (struct scroll_bar *) lParam); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3899 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3900 case WM_EMACS_SHOWWINDOW: |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3901 return ShowWindow ((HWND) wParam, (WPARAM) lParam); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3902 |
21608
d191a8737145
(w32_msg_pump): Handle WM_EMACS_SETLOCALE.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19707
diff
changeset
|
3903 case WM_EMACS_SETFOREGROUND: |
24718
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3904 { |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3905 HWND foreground_window; |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3906 DWORD foreground_thread, retval; |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3907 |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3908 /* 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
|
3909 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
|
3910 pull the focus away from it. */ |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3911 foreground_window = GetForegroundWindow (); |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3912 foreground_thread = GetWindowThreadProcessId (foreground_window, NULL); |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3913 if (!foreground_window |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3914 || foreground_thread == GetCurrentThreadId () |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3915 || !AttachThreadInput (GetCurrentThreadId (), |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3916 foreground_thread, TRUE)) |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3917 foreground_thread = 0; |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3918 |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3919 retval = SetForegroundWindow ((HWND) wParam); |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3920 |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3921 /* Detach from the previous foreground thread. */ |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3922 if (foreground_thread) |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3923 AttachThreadInput (GetCurrentThreadId (), |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3924 foreground_thread, FALSE); |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3925 |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3926 return retval; |
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
3927 } |
21608
d191a8737145
(w32_msg_pump): Handle WM_EMACS_SETLOCALE.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19707
diff
changeset
|
3928 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3929 case WM_EMACS_SETWINDOWPOS: |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
3930 { |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3931 WINDOWPOS * pos = (WINDOWPOS *) wParam; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3932 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
|
3933 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
|
3934 } |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3935 |
13434 | 3936 case WM_EMACS_DESTROYWINDOW: |
21884 | 3937 DragAcceptFiles ((HWND) wParam, FALSE); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3938 return DestroyWindow ((HWND) wParam); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3939 |
42865
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3940 case WM_EMACS_HIDE_CARET: |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3941 return HideCaret (hwnd); |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3942 |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3943 case WM_EMACS_SHOW_CARET: |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3944 return ShowCaret (hwnd); |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3945 |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
3946 case WM_EMACS_DESTROY_CARET: |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
3947 w32_system_caret_hwnd = NULL; |
42865
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3948 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
|
3949 return DestroyCaret (); |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
3950 |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
3951 case WM_EMACS_TRACK_CARET: |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
3952 /* 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
|
3953 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
|
3954 { |
42865
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3955 /* 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
|
3956 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
|
3957 w32_system_caret_hwnd = hwnd; |
42865
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3958 CreateCaret (hwnd, NULL, 0, |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
3959 w32_system_caret_height); |
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
3960 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3961 |
42865
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3962 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
|
3963 return 0; |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3964 /* 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
|
3965 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
|
3966 && w32_visible_system_caret_hwnd != hwnd) |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3967 { |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3968 w32_visible_system_caret_hwnd = hwnd; |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3969 return ShowCaret (hwnd); |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3970 } |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3971 /* 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
|
3972 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
|
3973 && w32_visible_system_caret_hwnd) |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3974 { |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3975 w32_visible_system_caret_hwnd = NULL; |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3976 return HideCaret (hwnd); |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3977 } |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3978 else |
40d08b8571ec
(w32_visible_system_caret_hwnd): New static variable.
Jason Rumney <jasonr@gnu.org>
parents:
42845
diff
changeset
|
3979 return 1; |
40385
b3dbd98f9b97
(w32_wnd_proc) <WM_KILLFOCUS>: Destroy the system caret.
Jason Rumney <jasonr@gnu.org>
parents:
40120
diff
changeset
|
3980 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3981 case WM_EMACS_TRACKPOPUPMENU: |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3982 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3983 UINT flags; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3984 POINT *pos; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3985 int retval; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3986 pos = (POINT *)lParam; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3987 flags = TPM_CENTERALIGN; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3988 if (button_state & LMOUSE) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3989 flags |= TPM_LEFTBUTTON; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3990 else if (button_state & RMOUSE) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3991 flags |= TPM_RIGHTBUTTON; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
3992 |
21735
711a61942023
(x_set_vertical_scroll_bars): Put scroll bars on the
Geoff Voelker <voelker@cs.washington.edu>
parents:
21608
diff
changeset
|
3993 /* 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
|
3994 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
|
3995 ReleaseCapture (); |
23160
95a213639589
(w32_wnd_proc): Always zero button_state when releasing
Geoff Voelker <voelker@cs.washington.edu>
parents:
22625
diff
changeset
|
3996 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
|
3997 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
3998 /* 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
|
3999 TrackPopupMenu below, and should be ignored. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4000 f = x_window_to_frame (dpyinfo, hwnd); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4001 if (f) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4002 f->output_data.w32->menubar_active = 1; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4003 |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4004 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
|
4005 0, hwnd, NULL)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4006 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4007 MSG amsg; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4008 /* Eat any mouse messages during popupmenu */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4009 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
|
4010 PM_REMOVE)); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4011 /* Get the menu selection, if any */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4012 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
|
4013 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4014 retval = LOWORD (amsg.wParam); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4015 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4016 else |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4017 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4018 retval = 0; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4019 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4020 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4021 else |
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 retval = -1; |
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 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4026 return retval; |
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 |
13434 | 4029 default: |
21874
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
4030 /* Check for messages registered at runtime. */ |
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
4031 if (msg == msh_mousewheel) |
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
4032 { |
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
4033 wmsg.dwModifiers = w32_get_modifiers (); |
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
4034 my_post_msg (&wmsg, hwnd, msg, wParam, lParam); |
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
4035 return 0; |
c0871d40073e
(msh_mousewheel): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21735
diff
changeset
|
4036 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4037 |
13434 | 4038 dflt: |
4039 return DefWindowProc (hwnd, msg, wParam, lParam); | |
4040 } | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4041 |
19707
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 /* 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
|
4044 return 0; |
13434 | 4045 } |
4046 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4047 void |
13434 | 4048 my_create_window (f) |
4049 struct frame * f; | |
4050 { | |
4051 MSG msg; | |
4052 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4053 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
|
4054 abort (); |
13434 | 4055 GetMessage (&msg, NULL, WM_EMACS_DONE, WM_EMACS_DONE); |
4056 } | |
4057 | |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4058 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4059 /* 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
|
4060 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
|
4061 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
|
4062 deadlocks when tooltips are created for menu items. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4063 void |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4064 my_create_tip_window (f) |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4065 struct frame *f; |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4066 { |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
4067 RECT rect; |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
4068 |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
4069 rect.left = rect.top = 0; |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4070 rect.right = FRAME_PIXEL_WIDTH (f); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4071 rect.bottom = FRAME_PIXEL_HEIGHT (f); |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
4072 |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
4073 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
|
4074 FRAME_EXTERNAL_MENU_BAR (f)); |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
4075 |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
4076 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
|
4077 = CreateWindow (EMACS_CLASS, |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4078 f->namebuf, |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4079 f->output_data.w32->dwStyle, |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4080 f->left_pos, |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4081 f->top_pos, |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
4082 rect.right - rect.left, |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
4083 rect.bottom - rect.top, |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4084 FRAME_W32_WINDOW (SELECTED_FRAME ()), /* owner */ |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4085 NULL, |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4086 hinst, |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4087 NULL); |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4088 |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
4089 if (tip_window) |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
4090 { |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4091 SetWindowLong (tip_window, WND_FONTWIDTH_INDEX, FRAME_COLUMN_WIDTH (f)); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4092 SetWindowLong (tip_window, WND_LINEHEIGHT_INDEX, FRAME_LINE_HEIGHT (f)); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4093 SetWindowLong (tip_window, WND_BORDER_INDEX, FRAME_INTERNAL_BORDER_WIDTH (f)); |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
4094 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
|
4095 |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
4096 /* Tip frames have no scrollbars. */ |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
4097 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
|
4098 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4099 /* 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
|
4100 ShowWindow (tip_window, SW_HIDE); |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4101 } |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4102 } |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4103 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
4104 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4105 /* Create and set up the w32 window for frame F. */ |
13434 | 4106 |
4107 static void | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4108 w32_window (f, window_prompting, minibuffer_only) |
13434 | 4109 struct frame *f; |
4110 long window_prompting; | |
4111 int minibuffer_only; | |
4112 { | |
4113 BLOCK_INPUT; | |
4114 | |
4115 /* Use the resource name as the top-level window name | |
4116 for looking up resources. Make a non-Lisp copy | |
4117 for the window manager, so GC relocation won't bother it. | |
4118 | |
4119 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
|
4120 |
13434 | 4121 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4122 char *str = (char *) SDATA (Vx_resource_name); |
13434 | 4123 f->namebuf = (char *) xmalloc (strlen (str) + 1); |
4124 strcpy (f->namebuf, str); | |
4125 } | |
4126 | |
4127 my_create_window (f); | |
4128 | |
4129 validate_x_resource_name (); | |
4130 | |
4131 /* x_set_name normally ignores requests to set the name if the | |
4132 requested name is the same as the current name. This is the one | |
4133 place where that assumption isn't correct; f->name is set, but | |
4134 the server hasn't been told. */ | |
4135 { | |
4136 Lisp_Object name; | |
4137 int explicit = f->explicit_name; | |
4138 | |
4139 f->explicit_name = 0; | |
4140 name = f->name; | |
4141 f->name = Qnil; | |
4142 x_set_name (f, name, explicit); | |
4143 } | |
4144 | |
4145 UNBLOCK_INPUT; | |
4146 | |
4147 if (!minibuffer_only && FRAME_EXTERNAL_MENU_BAR (f)) | |
4148 initialize_frame_menubar (f); | |
4149 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4150 if (FRAME_W32_WINDOW (f) == 0) |
13434 | 4151 error ("Unable to create window"); |
4152 } | |
4153 | |
4154 /* Handle the icon stuff for this window. Perhaps later we might | |
4155 want an x_set_icon_position which can be called interactively as | |
4156 well. */ | |
4157 | |
4158 static void | |
4159 x_icon (f, parms) | |
4160 struct frame *f; | |
4161 Lisp_Object parms; | |
4162 { | |
4163 Lisp_Object icon_x, icon_y; | |
4164 | |
16884
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16602
diff
changeset
|
4165 /* Set the position of the icon. Note that Windows 95 groups all |
13434 | 4166 icons in the tray. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4167 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
|
4168 icon_y = w32_get_arg (parms, Qicon_top, 0, 0, RES_TYPE_NUMBER); |
13434 | 4169 if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound)) |
4170 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
4171 CHECK_NUMBER (icon_x); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
4172 CHECK_NUMBER (icon_y); |
13434 | 4173 } |
4174 else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound)) | |
4175 error ("Both left and top icon corners of icon must be specified"); | |
4176 | |
4177 BLOCK_INPUT; | |
4178 | |
4179 if (! EQ (icon_x, Qunbound)) | |
4180 x_wm_set_icon_position (f, XINT (icon_x), XINT (icon_y)); | |
4181 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4182 #if 0 /* TODO */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4183 /* Start up iconic or window? */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4184 x_wm_set_window_state |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4185 (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
|
4186 ? IconicState |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4187 : NormalState)); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4188 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4189 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
|
4190 ? 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
|
4191 : f->name))); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4192 #endif |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4193 |
13434 | 4194 UNBLOCK_INPUT; |
4195 } | |
4196 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4197 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4198 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4199 x_make_gc (f) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4200 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4201 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4202 XGCValues gc_values; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4203 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4204 BLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4205 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4206 /* Create the GC's of this frame. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4207 Note that many default values are used. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4208 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4209 /* Normal video */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4210 gc_values.font = FRAME_FONT (f); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4211 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4212 /* 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
|
4213 gc_values.foreground = FRAME_BACKGROUND_PIXEL (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4214 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
|
4215 f->output_data.w32->cursor_gc |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4216 = XCreateGC (NULL, FRAME_W32_WINDOW (f), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4217 (GCFont | GCForeground | GCBackground), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4218 &gc_values); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4219 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4220 /* Reliefs. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4221 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
|
4222 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
|
4223 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4224 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4225 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4226 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4227 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4228 /* 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
|
4229 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
|
4230 constructed. */ |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4231 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4232 static Lisp_Object |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4233 unwind_create_frame (frame) |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4234 Lisp_Object frame; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4235 { |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4236 struct frame *f = XFRAME (frame); |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4237 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4238 /* 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
|
4239 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
|
4240 { |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4241 #ifdef GLYPH_DEBUG |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4242 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
|
4243 #endif |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4244 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4245 x_free_frame_resources (f); |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4246 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4247 /* 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
|
4248 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
|
4249 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
|
4250 |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
4251 return Qt; |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4252 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4253 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4254 return Qnil; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4255 } |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4256 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4257 |
13434 | 4258 DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, |
4259 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
|
4260 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
|
4261 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
|
4262 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
|
4263 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
|
4264 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
|
4265 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
|
4266 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
|
4267 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
4268 This function is an internal primitive--use `make-frame' instead. */) |
13434 | 4269 (parms) |
4270 Lisp_Object parms; | |
4271 { | |
4272 struct frame *f; | |
4273 Lisp_Object frame, tem; | |
4274 Lisp_Object name; | |
4275 int minibuffer_only = 0; | |
4276 long window_prompting = 0; | |
4277 int width, height; | |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46272
diff
changeset
|
4278 int count = SPECPDL_INDEX (); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4279 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
13434 | 4280 Lisp_Object display; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4281 struct w32_display_info *dpyinfo = NULL; |
13434 | 4282 Lisp_Object parent; |
4283 struct kboard *kb; | |
4284 | |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4285 check_w32 (); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4286 |
13434 | 4287 /* Use this general default value to start with |
4288 until we know if this frame has a specified name. */ | |
4289 Vx_resource_name = Vinvocation_name; | |
4290 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4291 display = w32_get_arg (parms, Qdisplay, 0, 0, RES_TYPE_STRING); |
13434 | 4292 if (EQ (display, Qunbound)) |
4293 display = Qnil; | |
4294 dpyinfo = check_x_display_info (display); | |
4295 #ifdef MULTI_KBOARD | |
4296 kb = dpyinfo->kboard; | |
4297 #else | |
4298 kb = &the_only_kboard; | |
4299 #endif | |
4300 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4301 name = w32_get_arg (parms, Qname, "name", "Name", RES_TYPE_STRING); |
13434 | 4302 if (!STRINGP (name) |
4303 && ! EQ (name, Qunbound) | |
4304 && ! NILP (name)) | |
4305 error ("Invalid frame name--not a string or nil"); | |
4306 | |
4307 if (STRINGP (name)) | |
4308 Vx_resource_name = name; | |
4309 | |
4310 /* See if parent window is specified. */ | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4311 parent = w32_get_arg (parms, Qparent_id, NULL, NULL, RES_TYPE_NUMBER); |
13434 | 4312 if (EQ (parent, Qunbound)) |
4313 parent = Qnil; | |
4314 if (! NILP (parent)) | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
4315 CHECK_NUMBER (parent); |
13434 | 4316 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4317 /* 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
|
4318 /* 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
|
4319 it to make_frame_without_minibuffer. */ |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4320 frame = Qnil; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4321 GCPRO4 (parms, parent, name, frame); |
32669
092d2df2a6c3
(Fx_create_frame): Don't bother calling
Jason Rumney <jasonr@gnu.org>
parents:
31110
diff
changeset
|
4322 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
|
4323 RES_TYPE_SYMBOL); |
13434 | 4324 if (EQ (tem, Qnone) || NILP (tem)) |
4325 f = make_frame_without_minibuffer (Qnil, kb, display); | |
4326 else if (EQ (tem, Qonly)) | |
4327 { | |
4328 f = make_minibuffer_frame (); | |
4329 minibuffer_only = 1; | |
4330 } | |
4331 else if (WINDOWP (tem)) | |
4332 f = make_frame_without_minibuffer (tem, kb, display); | |
4333 else | |
4334 f = make_frame (1); | |
4335 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4336 XSETFRAME (frame, f); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4337 |
13434 | 4338 /* Note that Windows does support scroll bars. */ |
4339 FRAME_CAN_HAVE_SCROLL_BARS (f) = 1; | |
50362
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
4340 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4341 /* By default, make scrollbars the system standard width. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4342 FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = GetSystemMetrics (SM_CXVSCROLL); |
13434 | 4343 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4344 f->output_method = output_w32; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4345 f->output_data.w32 = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4346 (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
|
4347 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
|
4348 FRAME_FONTSET (f) = -1; |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
4349 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
|
4350 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4351 f->icon_name |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4352 = 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
|
4353 if (! STRINGP (f->icon_name)) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4354 f->icon_name = Qnil; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4355 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4356 /* FRAME_W32_DISPLAY_INFO (f) = dpyinfo; */ |
13434 | 4357 #ifdef MULTI_KBOARD |
4358 FRAME_KBOARD (f) = kb; | |
4359 #endif | |
4360 | |
4361 /* Specify the parent under which to make this window. */ | |
4362 | |
4363 if (!NILP (parent)) | |
4364 { | |
32669
092d2df2a6c3
(Fx_create_frame): Don't bother calling
Jason Rumney <jasonr@gnu.org>
parents:
31110
diff
changeset
|
4365 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
|
4366 f->output_data.w32->explicit_parent = 1; |
13434 | 4367 } |
4368 else | |
4369 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4370 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
|
4371 f->output_data.w32->explicit_parent = 0; |
13434 | 4372 } |
4373 | |
4374 /* Set the name; the functions to which we pass f expect the name to | |
4375 be set. */ | |
4376 if (EQ (name, Qunbound) || NILP (name)) | |
4377 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4378 f->name = build_string (dpyinfo->w32_id_name); |
13434 | 4379 f->explicit_name = 0; |
4380 } | |
4381 else | |
4382 { | |
4383 f->name = name; | |
4384 f->explicit_name = 1; | |
4385 /* use the frame's title when getting resources for this frame. */ | |
4386 specbind (Qx_resource_name, name); | |
4387 } | |
4388 | |
4389 /* Extract the window parameters from the supplied values | |
4390 that are needed to determine window geometry. */ | |
4391 { | |
4392 Lisp_Object font; | |
4393 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4394 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
|
4395 |
13434 | 4396 BLOCK_INPUT; |
4397 /* First, try whatever font the caller has specified. */ | |
4398 if (STRINGP (font)) | |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4399 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4400 tem = Fquery_fontset (font, Qnil); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4401 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
|
4402 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
|
4403 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4404 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
|
4405 } |
13434 | 4406 /* Try out a font which we hope has bold and italic variations. */ |
4407 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
|
4408 font = x_new_font (f, "-*-Courier New-normal-r-*-*-*-100-*-*-c-*-iso8859-1"); |
13434 | 4409 if (! STRINGP (font)) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4410 font = x_new_font (f, "-*-Courier-normal-r-*-*-13-*-*-*-c-*-iso8859-1"); |
13434 | 4411 /* If those didn't work, look for something which will at least work. */ |
4412 if (! STRINGP (font)) | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4413 font = x_new_font (f, "-*-Fixedsys-normal-r-*-*-12-*-*-*-c-*-iso8859-1"); |
13434 | 4414 UNBLOCK_INPUT; |
4415 if (! STRINGP (font)) | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4416 font = build_string ("Fixedsys"); |
13434 | 4417 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4418 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
|
4419 "font", "Font", RES_TYPE_STRING); |
13434 | 4420 } |
4421 | |
4422 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
|
4423 "borderWidth", "BorderWidth", RES_TYPE_NUMBER); |
13434 | 4424 /* This defaults to 2 in order to match xterm. We recognize either |
4425 internalBorderWidth or internalBorder (which is what xterm calls | |
4426 it). */ | |
4427 if (NILP (Fassq (Qinternal_border_width, parms))) | |
4428 { | |
4429 Lisp_Object value; | |
4430 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4431 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
|
4432 "internalBorder", "InternalBorder", RES_TYPE_NUMBER); |
13434 | 4433 if (! EQ (value, Qunbound)) |
4434 parms = Fcons (Fcons (Qinternal_border_width, value), | |
4435 parms); | |
4436 } | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4437 /* Default internalBorderWidth to 0 on Windows to match other programs. */ |
13434 | 4438 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
|
4439 "internalBorderWidth", "InternalBorder", RES_TYPE_NUMBER); |
092d2df2a6c3
(Fx_create_frame): Don't bother calling
Jason Rumney <jasonr@gnu.org>
parents:
31110
diff
changeset
|
4440 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
|
4441 "verticalScrollBars", "ScrollBars", RES_TYPE_SYMBOL); |
13434 | 4442 |
4443 /* Also do the stuff which must be set before the window exists. */ | |
4444 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
|
4445 "foreground", "Foreground", RES_TYPE_STRING); |
13434 | 4446 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
|
4447 "background", "Background", RES_TYPE_STRING); |
13434 | 4448 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
|
4449 "pointerColor", "Foreground", RES_TYPE_STRING); |
13434 | 4450 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
|
4451 "cursorColor", "Foreground", RES_TYPE_STRING); |
13434 | 4452 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
|
4453 "borderColor", "BorderColor", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4454 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
|
4455 "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
|
4456 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
|
4457 "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
|
4458 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
|
4459 "leftFringe", "LeftFringe", RES_TYPE_NUMBER); |
2dd41afd9b55
Merged fringe width related changes from xfns.c.
Kim F. Storm <storm@cua.dk>
parents:
41638
diff
changeset
|
4460 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
|
4461 "rightFringe", "RightFringe", RES_TYPE_NUMBER); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4462 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4463 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4464 /* 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
|
4465 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
|
4466 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
|
4467 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
|
4468 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
|
4469 happen. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4470 init_frame_faces (f); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4471 |
13434 | 4472 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
|
4473 "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
|
4474 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
|
4475 "toolBar", "ToolBar", RES_TYPE_NUMBER); |
44109
b615e4daf825
[HAVE_IMAGES, HAVE_PBM]: Remove conditionals.
Jason Rumney <jasonr@gnu.org>
parents:
44097
diff
changeset
|
4476 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4477 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
|
4478 "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4479 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
|
4480 "title", "Title", RES_TYPE_STRING); |
43398 | 4481 x_default_parameter (f, parms, Qfullscreen, Qnil, |
4482 "fullscreen", "Fullscreen", RES_TYPE_SYMBOL); | |
13434 | 4483 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4484 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
|
4485 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
|
4486 |
49369
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
4487 f->output_data.w32->text_cursor = w32_load_cursor (IDC_IBEAM); |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
4488 f->output_data.w32->nontext_cursor = w32_load_cursor (IDC_ARROW); |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
4489 f->output_data.w32->modeline_cursor = w32_load_cursor (IDC_ARROW); |
50229
e3a41ffa1cba
Remove setup of cross_cursor (already has hand_cursor).
Kim F. Storm <storm@cua.dk>
parents:
50164
diff
changeset
|
4490 f->output_data.w32->hand_cursor = w32_load_cursor (IDC_HAND); |
49369
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
4491 f->output_data.w32->hourglass_cursor = w32_load_cursor (IDC_WAIT); |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
4492 f->output_data.w32->horizontal_drag_cursor = w32_load_cursor (IDC_SIZEWE); |
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
4493 |
50362
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
4494 window_prompting = x_figure_window_size (f, parms, 1); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4495 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4496 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
|
4497 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
|
4498 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4499 w32_window (f, window_prompting, minibuffer_only); |
13434 | 4500 x_icon (f, parms); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4501 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4502 x_make_gc (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4503 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4504 /* Now consider the frame official. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4505 FRAME_W32_DISPLAY_INFO (f)->reference_count++; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4506 Vframe_list = Fcons (frame, Vframe_list); |
13434 | 4507 |
4508 /* We need to do this after creating the window, so that the | |
4509 icon-creation functions can say whose icon they're describing. */ | |
4510 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
|
4511 "bitmapIcon", "BitmapIcon", RES_TYPE_SYMBOL); |
13434 | 4512 |
4513 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
|
4514 "autoRaise", "AutoRaiseLower", RES_TYPE_BOOLEAN); |
13434 | 4515 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
|
4516 "autoLower", "AutoRaiseLower", RES_TYPE_BOOLEAN); |
13434 | 4517 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
|
4518 "cursorType", "CursorType", RES_TYPE_SYMBOL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4519 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
|
4520 "scrollBarWidth", "ScrollBarWidth", RES_TYPE_NUMBER); |
13434 | 4521 |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4522 /* Dimensions, especially FRAME_LINES (f), must be done via change_frame_size. |
13434 | 4523 Change will not be effected unless different from the current |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4524 FRAME_LINES (f). */ |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4525 width = FRAME_COLS (f); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4526 height = FRAME_LINES (f); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4527 |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4528 FRAME_LINES (f) = 0; |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
4529 SET_FRAME_COLS (f, 0); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4530 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
|
4531 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4532 /* 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
|
4533 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
|
4534 bar so that its size can be taken into account. */ |
13434 | 4535 BLOCK_INPUT; |
4536 x_wm_set_size_hint (f, window_prompting, 0); | |
4537 UNBLOCK_INPUT; | |
4538 | |
42833
4510d4d4bac4
(Fx_create_frame): Bind redisplay-dont-pause around
Jason Rumney <jasonr@gnu.org>
parents:
42719
diff
changeset
|
4539 /* 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
|
4540 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
|
4541 specbind(Qredisplay_dont_pause, Qt); |
4510d4d4bac4
(Fx_create_frame): Bind redisplay-dont-pause around
Jason Rumney <jasonr@gnu.org>
parents:
42719
diff
changeset
|
4542 |
34133
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
4543 /* 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
|
4544 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
|
4545 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
|
4546 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
|
4547 new frames. */ |
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
4548 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
|
4549 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4550 /* 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
|
4551 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
|
4552 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
|
4553 if (! f->output_data.w32->explicit_parent) |
13434 | 4554 { |
4555 Lisp_Object visibility; | |
4556 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4557 visibility = w32_get_arg (parms, Qvisibility, 0, 0, RES_TYPE_SYMBOL); |
13434 | 4558 if (EQ (visibility, Qunbound)) |
4559 visibility = Qt; | |
4560 | |
4561 if (EQ (visibility, Qicon)) | |
4562 x_iconify_frame (f); | |
4563 else if (! NILP (visibility)) | |
4564 x_make_frame_visible (f); | |
4565 else | |
4566 /* Must have been Qnil. */ | |
4567 ; | |
4568 } | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4569 UNGCPRO; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4570 |
36594
756c28377036
(Fx_create_frame): Clear Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
36312
diff
changeset
|
4571 /* 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
|
4572 and similar functions. */ |
756c28377036
(Fx_create_frame): Clear Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents:
36312
diff
changeset
|
4573 Vwindow_list = Qnil; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4574 |
13434 | 4575 return unbind_to (count, frame); |
4576 } | |
4577 | |
4578 /* FRAME is used only to get a handle on the X display. We don't pass the | |
4579 display info directly because we're called from frame.c, which doesn't | |
4580 know about that structure. */ | |
4581 Lisp_Object | |
4582 x_get_focus_frame (frame) | |
4583 struct frame *frame; | |
4584 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4585 struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (frame); |
13434 | 4586 Lisp_Object xfocus; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4587 if (! dpyinfo->w32_focus_frame) |
13434 | 4588 return Qnil; |
4589 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4590 XSETFRAME (xfocus, dpyinfo->w32_focus_frame); |
13434 | 4591 return xfocus; |
4592 } | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4593 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4594 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
|
4595 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
|
4596 (frame) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4597 Lisp_Object frame; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4598 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4599 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
|
4600 return Qnil; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4601 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
4602 |
13434 | 4603 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4604 /* 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
|
4605 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
|
4606 { |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4607 char *charset, *encoding; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4608 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4609 encoding = strrchr(fontname, '-'); |
34284
3a21ff35392b
(xlfd_charset_of_font): Don't overwrite fontname
Andrew Innes <andrewi@gnu.org>
parents:
34133
diff
changeset
|
4610 if (!encoding || encoding == fontname) |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4611 return NULL; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4612 |
34314
8318a4ea6764
(xlfd_charset_of_font): Fix last change.
Andrew Innes <andrewi@gnu.org>
parents:
34284
diff
changeset
|
4613 for (charset = encoding - 1; charset >= fontname; charset--) |
8318a4ea6764
(xlfd_charset_of_font): Fix last change.
Andrew Innes <andrewi@gnu.org>
parents:
34284
diff
changeset
|
4614 if (*charset == '-') |
8318a4ea6764
(xlfd_charset_of_font): Fix last change.
Andrew Innes <andrewi@gnu.org>
parents:
34284
diff
changeset
|
4615 break; |
8318a4ea6764
(xlfd_charset_of_font): Fix last change.
Andrew Innes <andrewi@gnu.org>
parents:
34284
diff
changeset
|
4616 |
8318a4ea6764
(xlfd_charset_of_font): Fix last change.
Andrew Innes <andrewi@gnu.org>
parents:
34284
diff
changeset
|
4617 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
|
4618 return NULL; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4619 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4620 return charset + 1; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4621 } |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4622 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4623 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
|
4624 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
|
4625 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
|
4626 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
|
4627 char * charset); |
6bc1c4d4eb50
(w32_to_x_font): Change prototype to fit the declaration.
Eli Zaretskii <eliz@gnu.org>
parents:
36594
diff
changeset
|
4628 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
|
4629 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
4630 static struct font_info * |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4631 w32_load_system_font (f,fontname,size) |
24670 | 4632 struct frame *f; |
4633 char * fontname; | |
4634 int size; | |
13434 | 4635 { |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4636 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
|
4637 Lisp_Object font_names; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4638 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4639 /* 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
|
4640 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
|
4641 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
|
4642 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
|
4643 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4644 if (!NILP (font_names)) |
14353 | 4645 { |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4646 Lisp_Object tail; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4647 int i; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4648 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4649 /* 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
|
4650 than loading another one. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4651 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
|
4652 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
|
4653 if (dpyinfo->font_table[i].name |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4654 && (!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
|
4655 SDATA (XCAR (tail))) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4656 || !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
|
4657 SDATA (XCAR (tail))))) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4658 return (dpyinfo->font_table + i); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4659 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4660 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
|
4661 } |
24481
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
4662 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
|
4663 { |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
4664 /* 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
|
4665 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
|
4666 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
|
4667 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
|
4668 listed or not. */ |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
4669 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
|
4670 FARPROC enum_font_families_ex |
24481
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
4671 = 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
|
4672 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
|
4673 return NULL; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
4674 } |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4675 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4676 /* 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
|
4677 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4678 char *full_name, *encoding, *charset; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4679 XFontStruct *font; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4680 struct font_info *fontp; |
14353 | 4681 LOGFONT lf; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4682 BOOL ok; |
40009
f6ecf530f0a3
(w32_load_system_font): Cache codepage for font, in
Andrew Innes <andrewi@gnu.org>
parents:
39973
diff
changeset
|
4683 int codepage; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4684 int i; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4685 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4686 if (!fontname || !x_to_w32_font (fontname, &lf)) |
14353 | 4687 return (NULL); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4688 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4689 if (!*lf.lfFaceName) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4690 /* 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
|
4691 from CreateFontIndirect - this is not particularly |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4692 desirable, especially since CreateFontIndirect does not |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4693 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
|
4694 ended up with. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4695 return NULL; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4696 |
48359
1e8497bc057d
(w32_load_system_font): Don't disable Cleartype.
Jason Rumney <jasonr@gnu.org>
parents:
48351
diff
changeset
|
4697 lf.lfQuality = DEFAULT_QUALITY; |
43210
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
4698 |
14353 | 4699 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
|
4700 bzero (font, sizeof (*font)); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4701 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4702 /* 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
|
4703 font->bdf = NULL; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4704 |
14353 | 4705 BLOCK_INPUT; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4706 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4707 font->hfont = CreateFontIndirect (&lf); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4708 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4709 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
|
4710 { |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
4711 ok = FALSE; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4712 } |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4713 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
|
4714 { |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
4715 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
|
4716 HANDLE oldobj; |
40009
f6ecf530f0a3
(w32_load_system_font): Cache codepage for font, in
Andrew Innes <andrewi@gnu.org>
parents:
39973
diff
changeset
|
4717 |
f6ecf530f0a3
(w32_load_system_font): Cache codepage for font, in
Andrew Innes <andrewi@gnu.org>
parents:
39973
diff
changeset
|
4718 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
|
4719 |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
4720 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
|
4721 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
|
4722 |
23620
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
4723 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
|
4724 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
|
4725 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
|
4726 else |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4727 { |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4728 /* 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
|
4729 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
|
4730 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
|
4731 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
|
4732 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
|
4733 working from anyway. */ |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4734 /* 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
|
4735 CPINFO cpi = {0}; |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4736 GetCPInfo (codepage, &cpi); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4737 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
|
4738 } |
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
|
4739 |
23620
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
4740 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
|
4741 ReleaseDC (dpyinfo->root_window, hdc); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4742 /* 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
|
4743 actually loaded. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4744 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
|
4745 lf.lfWidth = font->tm.tmAveCharWidth; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4746 lf.lfWeight = font->tm.tmWeight; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4747 lf.lfItalic = font->tm.tmItalic; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4748 lf.lfCharSet = font->tm.tmCharSet; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4749 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
|
4750 ? VARIABLE_PITCH : FIXED_PITCH); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4751 lf.lfOutPrecision = ((font->tm.tmPitchAndFamily & TMPF_VECTOR) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4752 ? 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
|
4753 |
0574ffc14f77
(w32_load_system_font): Call w32_cache_char_metrics.
Andrew Innes <andrewi@gnu.org>
parents:
32669
diff
changeset
|
4754 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
|
4755 } |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
4756 |
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
4757 UNBLOCK_INPUT; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4758 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4759 if (!ok) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4760 { |
23620
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
4761 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
|
4762 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
|
4763 } |
13434 | 4764 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4765 /* 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
|
4766 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
|
4767 if (dpyinfo->font_table[i].name == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4768 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4769 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4770 /* 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
|
4771 if (i == dpyinfo->n_fonts |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4772 && 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
|
4773 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4774 int sz; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4775 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
|
4776 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
|
4777 dpyinfo->font_table |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4778 = (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
|
4779 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4780 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4781 fontp = dpyinfo->font_table + i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4782 if (i == dpyinfo->n_fonts) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4783 ++dpyinfo->n_fonts; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4784 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4785 /* 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
|
4786 BLOCK_INPUT; |
52737
6685d28af4a7
* w32fns.c (w32_load_system_font): Clear all members of FONTP before
Jason Rumney <jasonr@gnu.org>
parents:
52401
diff
changeset
|
4787 bzero (fontp, sizeof (*fontp)); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4788 fontp->font = font; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4789 fontp->font_idx = i; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4790 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
|
4791 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
|
4792 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4793 charset = xlfd_charset_of_font (fontname); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4794 |
40009
f6ecf530f0a3
(w32_load_system_font): Cache codepage for font, in
Andrew Innes <andrewi@gnu.org>
parents:
39973
diff
changeset
|
4795 /* 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
|
4796 (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
|
4797 fontp->codepage = codepage; |
f6ecf530f0a3
(w32_load_system_font): Cache codepage for font, in
Andrew Innes <andrewi@gnu.org>
parents:
39973
diff
changeset
|
4798 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4799 /* 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
|
4800 full_name = (char *)xmalloc (100); |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4801 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
|
4802 fontp->full_name = full_name; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4803 else |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4804 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4805 /* 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
|
4806 xfree (full_name); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4807 fontp->full_name = fontp->name; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4808 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4809 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4810 fontp->size = FONT_WIDTH (font); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4811 fontp->height = FONT_HEIGHT (font); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4812 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4813 /* 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
|
4814 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
|
4815 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
|
4816 (0:0x20..0x7F, 1:0xA0..0xFF, |
f62bb21d38db
(w32_wnd_proc): Handle WM_MENUSELECT message.
Jason Rumney <jasonr@gnu.org>
parents:
27936
diff
changeset
|
4817 (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
|
4818 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
|
4819 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
|
4820 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
|
4821 decided, set FONT_ENCODING_NOT_DECIDED. */ |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4822 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4823 /* 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
|
4824 type FONT_ENCODING_NOT_DECIDED. */ |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4825 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
|
4826 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
|
4827 fontp->encoding[1] = 4; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4828 else |
24692
a0a2521b783d
(x_to_w32_charset): Fix typo: want to map all Japanese
Andrew Innes <andrewi@gnu.org>
parents:
24679
diff
changeset
|
4829 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
|
4830 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4831 /* 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
|
4832 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
|
4833 fontp->baseline_offset = 0; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4834 fontp->relative_compose = 0; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4835 fontp->default_ascent = 0; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4836 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
4837 /* 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
|
4838 has a character with a smaller width than any other character |
43398 | 4839 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
|
4840 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
|
4841 glyph matrix reallocation necessary. */ |
43398 | 4842 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
|
4843 UNBLOCK_INPUT; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4844 return fontp; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4845 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4846 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
4847 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4848 /* 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
|
4849 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
|
4850 If loading fails, return NULL. */ |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4851 struct font_info * |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4852 w32_load_font (f,fontname,size) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4853 struct frame *f; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4854 char * fontname; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4855 int size; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4856 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4857 Lisp_Object bdf_fonts; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4858 struct font_info *retval = NULL; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4859 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
4860 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
|
4861 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4862 while (!retval && CONSP (bdf_fonts)) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4863 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4864 char *bdf_name, *bdf_file; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4865 Lisp_Object bdf_pair; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4866 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
4867 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
|
4868 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
|
4869 bdf_file = SDATA (XCDR (bdf_pair)); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4870 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4871 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
|
4872 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
4873 bdf_fonts = XCDR (bdf_fonts); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4874 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4875 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4876 if (retval) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4877 return retval; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4878 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4879 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
|
4880 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4881 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
4882 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4883 void |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4884 w32_unload_font (dpyinfo, font) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4885 struct w32_display_info *dpyinfo; |
13434 | 4886 XFontStruct * font; |
4887 { | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4888 if (font) |
13434 | 4889 { |
32721
0574ffc14f77
(w32_load_system_font): Call w32_cache_char_metrics.
Andrew Innes <andrewi@gnu.org>
parents:
32669
diff
changeset
|
4890 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
|
4891 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
|
4892 |
14353 | 4893 if (font->hfont) DeleteObject(font->hfont); |
13434 | 4894 xfree (font); |
4895 } | |
4896 } | |
4897 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4898 /* The font conversion stuff between x and w32 */ |
13434 | 4899 |
4900 /* X font string is as follows (from faces.el) | |
4901 * (let ((- "[-?]") | |
4902 * (foundry "[^-]+") | |
4903 * (family "[^-]+") | |
4904 * (weight "\\(bold\\|demibold\\|medium\\)") ; 1 | |
4905 * (weight\? "\\([^-]*\\)") ; 1 | |
4906 * (slant "\\([ior]\\)") ; 2 | |
4907 * (slant\? "\\([^-]?\\)") ; 2 | |
4908 * (swidth "\\([^-]*\\)") ; 3 | |
4909 * (adstyle "[^-]*") ; 4 | |
4910 * (pixelsize "[0-9]+") | |
4911 * (pointsize "[0-9][0-9]+") | |
4912 * (resx "[0-9][0-9]+") | |
4913 * (resy "[0-9][0-9]+") | |
4914 * (spacing "[cmp?*]") | |
4915 * (avgwidth "[0-9]+") | |
4916 * (registry "[^-]+") | |
4917 * (encoding "[^-]+") | |
4918 * ) | |
4919 */ | |
4920 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4921 static LONG |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4922 x_to_w32_weight (lpw) |
13434 | 4923 char * lpw; |
4924 { | |
4925 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
|
4926 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4927 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
|
4928 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
|
4929 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
|
4930 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
|
4931 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
|
4932 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
|
4933 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
|
4934 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
|
4935 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
|
4936 else if (stricmp (lpw,"thin") == 0) return FW_THIN; |
13434 | 4937 else |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4938 return FW_DONTCARE; |
13434 | 4939 } |
4940 | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4941 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4942 static char * |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4943 w32_to_x_weight (fnweight) |
13434 | 4944 int fnweight; |
4945 { | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4946 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
|
4947 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
|
4948 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
|
4949 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
|
4950 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
|
4951 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
|
4952 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
|
4953 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
|
4954 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
|
4955 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4956 return "*"; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4957 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4958 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
4959 static LONG |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
4960 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
|
4961 char * lpcs; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
4962 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4963 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
|
4964 char *charset; |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4965 int len = strlen (lpcs); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4966 |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4967 /* Support "*-#nnn" format for unknown charsets. */ |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4968 if (strncmp (lpcs, "*-#", 3) == 0) |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4969 return atoi (lpcs + 3); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4970 |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4971 /* 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
|
4972 charset = alloca (len + 1); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4973 strcpy (charset, lpcs); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4974 lpcs = strchr (charset, '*'); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4975 if (lpcs) |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4976 *lpcs = 0; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
4977 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
4978 /* 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
|
4979 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
|
4980 (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
|
4981 */ |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
4982 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
|
4983 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4984 if (NILP(this_entry)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4985 { |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4986 /* 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
|
4987 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
|
4988 return ANSI_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4989 else |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4990 return DEFAULT_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4991 } |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4992 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4993 w32_charset = Fcar (Fcdr (this_entry)); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4994 |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
4995 /* Translate Lisp symbol to number. */ |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4996 if (w32_charset == Qw32_charset_ansi) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4997 return ANSI_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4998 if (w32_charset == Qw32_charset_symbol) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
4999 return SYMBOL_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5000 if (w32_charset == Qw32_charset_shiftjis) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5001 return SHIFTJIS_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5002 if (w32_charset == Qw32_charset_hangeul) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5003 return HANGEUL_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5004 if (w32_charset == Qw32_charset_chinesebig5) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5005 return CHINESEBIG5_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5006 if (w32_charset == Qw32_charset_gb2312) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5007 return GB2312_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5008 if (w32_charset == Qw32_charset_oem) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5009 return OEM_CHARSET; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5010 #ifdef JOHAB_CHARSET |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5011 if (w32_charset == Qw32_charset_johab) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5012 return JOHAB_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5013 if (w32_charset == Qw32_charset_easteurope) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5014 return EASTEUROPE_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5015 if (w32_charset == Qw32_charset_turkish) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5016 return TURKISH_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5017 if (w32_charset == Qw32_charset_baltic) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5018 return BALTIC_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5019 if (w32_charset == Qw32_charset_russian) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5020 return RUSSIAN_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5021 if (w32_charset == Qw32_charset_arabic) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5022 return ARABIC_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5023 if (w32_charset == Qw32_charset_greek) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5024 return GREEK_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5025 if (w32_charset == Qw32_charset_hebrew) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5026 return HEBREW_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5027 if (w32_charset == Qw32_charset_vietnamese) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5028 return VIETNAMESE_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5029 if (w32_charset == Qw32_charset_thai) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5030 return THAI_CHARSET; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5031 if (w32_charset == Qw32_charset_mac) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5032 return MAC_CHARSET; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5033 #endif /* JOHAB_CHARSET */ |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5034 #ifdef UNICODE_CHARSET |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5035 if (w32_charset == Qw32_charset_unicode) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5036 return UNICODE_CHARSET; |
24718
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
5037 #endif |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5038 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5039 return DEFAULT_CHARSET; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5040 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5041 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5042 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
5043 static char * |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5044 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
|
5045 int fncharset; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5046 { |
40528
7fb50bbb61ad
(w32_to_x_charset): Increase size of XLFD charset buffer.
Jason Rumney <jasonr@gnu.org>
parents:
40385
diff
changeset
|
5047 static char buf[32]; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5048 Lisp_Object charset_type; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5049 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5050 switch (fncharset) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5051 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5052 case ANSI_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5053 /* 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
|
5054 being set up yet. */ |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5055 if (NILP(Vw32_charset_info_alist)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5056 return "iso8859-1"; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5057 charset_type = Qw32_charset_ansi; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5058 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5059 case DEFAULT_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5060 charset_type = Qw32_charset_default; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5061 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5062 case SYMBOL_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5063 charset_type = Qw32_charset_symbol; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5064 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5065 case SHIFTJIS_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5066 charset_type = Qw32_charset_shiftjis; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5067 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5068 case HANGEUL_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5069 charset_type = Qw32_charset_hangeul; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5070 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5071 case GB2312_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5072 charset_type = Qw32_charset_gb2312; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5073 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5074 case CHINESEBIG5_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5075 charset_type = Qw32_charset_chinesebig5; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5076 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5077 case OEM_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5078 charset_type = Qw32_charset_oem; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5079 break; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5080 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5081 /* 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
|
5082 character sets. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5083 #ifdef EASTEUROPE_CHARSET |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5084 case EASTEUROPE_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5085 charset_type = Qw32_charset_easteurope; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5086 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5087 case TURKISH_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5088 charset_type = Qw32_charset_turkish; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5089 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5090 case BALTIC_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5091 charset_type = Qw32_charset_baltic; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5092 break; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5093 case RUSSIAN_CHARSET: |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5094 charset_type = Qw32_charset_russian; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5095 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5096 case ARABIC_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5097 charset_type = Qw32_charset_arabic; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5098 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5099 case GREEK_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5100 charset_type = Qw32_charset_greek; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5101 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5102 case HEBREW_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5103 charset_type = Qw32_charset_hebrew; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5104 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5105 case VIETNAMESE_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5106 charset_type = Qw32_charset_vietnamese; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5107 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5108 case THAI_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5109 charset_type = Qw32_charset_thai; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5110 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5111 case MAC_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5112 charset_type = Qw32_charset_mac; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5113 break; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5114 case JOHAB_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5115 charset_type = Qw32_charset_johab; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5116 break; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5117 #endif |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5118 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5119 #ifdef UNICODE_CHARSET |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5120 case UNICODE_CHARSET: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5121 charset_type = Qw32_charset_unicode; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5122 break; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5123 #endif |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5124 default: |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5125 /* Encode numerical value of unknown charset. */ |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5126 sprintf (buf, "*-#%u", fncharset); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5127 return buf; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5128 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5129 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5130 { |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5131 Lisp_Object rest; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5132 char * best_match = NULL; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5133 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5134 /* 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
|
5135 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
|
5136 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
|
5137 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5138 Format of each entry is |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5139 (CHARSET_NAME . (WINDOWS_CHARSET . CODEPAGE)). |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5140 */ |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5141 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
|
5142 { |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5143 char * x_charset; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5144 Lisp_Object w32_charset; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5145 Lisp_Object codepage; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5146 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5147 Lisp_Object this_entry = XCAR (rest); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5148 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5149 /* Skip invalid entries in alist. */ |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5150 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
|
5151 || !CONSP (XCDR (this_entry)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5152 || !SYMBOLP (XCAR (XCDR (this_entry)))) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5153 continue; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5154 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5155 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
|
5156 w32_charset = XCAR (XCDR (this_entry)); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5157 codepage = XCDR (XCDR (this_entry)); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5158 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5159 /* 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
|
5160 which means ignore). */ |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5161 if (w32_charset == charset_type |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5162 && (!INTEGERP (codepage) || codepage == CP_DEFAULT |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5163 || IsValidCodePage (XINT (codepage)))) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5164 { |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5165 /* 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
|
5166 best. */ |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5167 if (!best_match) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5168 best_match = x_charset; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5169 /* 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
|
5170 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
|
5171 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
|
5172 && 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
|
5173 best_match = x_charset; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5174 /* 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
|
5175 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
|
5176 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
|
5177 && 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
|
5178 { |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5179 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
|
5180 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
|
5181 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
|
5182 best_match = x_charset; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5183 } |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5184 } |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5185 } |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5186 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5187 /* 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
|
5188 if (!best_match) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5189 { |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5190 sprintf (buf, "*-#%u", fncharset); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5191 return buf; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5192 } |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5193 |
40528
7fb50bbb61ad
(w32_to_x_charset): Increase size of XLFD charset buffer.
Jason Rumney <jasonr@gnu.org>
parents:
40385
diff
changeset
|
5194 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
|
5195 buf[31] = '\0'; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5196 return buf; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5197 } |
13434 | 5198 } |
5199 | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5200 |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5201 /* 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
|
5202 static Lisp_Object |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5203 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
|
5204 int fncharset; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5205 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5206 static char buf[32]; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5207 Lisp_Object charset_type; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5208 Lisp_Object retval = Qnil; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5209 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5210 switch (fncharset) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5211 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5212 case ANSI_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5213 /* 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
|
5214 being set up yet. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5215 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
|
5216 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
|
5217 |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5218 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
|
5219 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5220 case DEFAULT_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5221 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
|
5222 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5223 case SYMBOL_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5224 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
|
5225 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5226 case SHIFTJIS_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5227 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
|
5228 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5229 case HANGEUL_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5230 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
|
5231 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5232 case GB2312_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5233 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
|
5234 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5235 case CHINESEBIG5_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5236 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
|
5237 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5238 case OEM_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5239 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
|
5240 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5241 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5242 /* 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
|
5243 character sets. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5244 #ifdef EASTEUROPE_CHARSET |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5245 case EASTEUROPE_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5246 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
|
5247 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5248 case TURKISH_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5249 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
|
5250 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5251 case BALTIC_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5252 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
|
5253 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5254 case RUSSIAN_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5255 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
|
5256 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5257 case ARABIC_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5258 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
|
5259 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5260 case GREEK_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5261 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
|
5262 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5263 case HEBREW_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5264 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
|
5265 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5266 case VIETNAMESE_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5267 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
|
5268 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5269 case THAI_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5270 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
|
5271 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5272 case MAC_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5273 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
|
5274 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5275 case JOHAB_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5276 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
|
5277 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5278 #endif |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5279 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5280 #ifdef UNICODE_CHARSET |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5281 case UNICODE_CHARSET: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5282 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
|
5283 break; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5284 #endif |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5285 default: |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5286 /* 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
|
5287 sprintf (buf, "*-#%u", fncharset); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5288 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
|
5289 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5290 |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5291 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5292 Lisp_Object rest; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5293 /* 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
|
5294 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
|
5295 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5296 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
|
5297 (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
|
5298 */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5299 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
|
5300 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5301 Lisp_Object x_charset; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5302 Lisp_Object w32_charset; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5303 Lisp_Object codepage; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5304 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5305 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
|
5306 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5307 /* 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
|
5308 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
|
5309 || !CONSP (XCDR (this_entry)) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5310 || !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
|
5311 continue; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5312 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5313 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
|
5314 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
|
5315 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
|
5316 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5317 /* 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
|
5318 which means ignore). */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5319 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
|
5320 && (!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
|
5321 || IsValidCodePage (XINT (codepage)))) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5322 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5323 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
|
5324 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5325 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5326 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5327 /* 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
|
5328 if (NILP (retval)) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5329 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5330 sprintf (buf, "*-#%u", fncharset); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5331 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
|
5332 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5333 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5334 return retval; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5335 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5336 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5337 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5338 /* 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
|
5339 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
|
5340 w32-charset-to-codepage-alist. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5341 int |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5342 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
|
5343 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5344 Lisp_Object codepage, entry; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5345 char *charset_str, *charset, *end; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5346 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5347 if (NILP (Vw32_charset_info_alist)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5348 return CP_DEFAULT; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5349 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5350 /* 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
|
5351 charset = xlfd_charset_of_font (fontname); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5352 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5353 if (!charset) |
34284
3a21ff35392b
(xlfd_charset_of_font): Don't overwrite fontname
Andrew Innes <andrewi@gnu.org>
parents:
34133
diff
changeset
|
5354 return CP_UNKNOWN; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5355 |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5356 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
|
5357 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
|
5358 |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5359 #if 0 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5360 /* Remove leading "*-". */ |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5361 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
|
5362 charset = charset_str + 2; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5363 else |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5364 #endif |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5365 charset = charset_str; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5366 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5367 /* 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
|
5368 if (end = strchr (charset, '*')) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5369 { |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5370 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
|
5371 end--; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5372 *end = '\0'; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5373 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5374 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5375 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
|
5376 if (NILP (entry)) |
34284
3a21ff35392b
(xlfd_charset_of_font): Don't overwrite fontname
Andrew Innes <andrewi@gnu.org>
parents:
34133
diff
changeset
|
5377 return CP_UNKNOWN; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5378 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5379 codepage = Fcdr (Fcdr (entry)); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5380 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5381 if (NILP (codepage)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5382 return CP_8BIT; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5383 else if (XFASTINT (codepage) == XFASTINT (Qt)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5384 return CP_UNICODE; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5385 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
|
5386 return XINT (codepage); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5387 else |
34284
3a21ff35392b
(xlfd_charset_of_font): Don't overwrite fontname
Andrew Innes <andrewi@gnu.org>
parents:
34133
diff
changeset
|
5388 return CP_UNKNOWN; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5389 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5390 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
5391 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5392 static BOOL |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5393 w32_to_x_font (lplogfont, lpxstr, len, specific_charset) |
13434 | 5394 LOGFONT * lplogfont; |
5395 char * lpxstr; | |
5396 int len; | |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5397 char * specific_charset; |
13434 | 5398 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5399 char* fonttype; |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
5400 char *fontname; |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5401 char height_pixels[8]; |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5402 char height_dpi[8]; |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5403 char width_pixels[8]; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5404 char *fontname_dash; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
5405 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
|
5406 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
|
5407 int bufsz; |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
5408 struct coding_system coding; |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5409 |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5410 if (!lpxstr) abort (); |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5411 |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5412 if (!lplogfont) |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5413 return FALSE; |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5414 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5415 if (lplogfont->lfOutPrecision == OUT_STRING_PRECIS) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5416 fonttype = "raster"; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5417 else if (lplogfont->lfOutPrecision == OUT_STROKE_PRECIS) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5418 fonttype = "outline"; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5419 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5420 fonttype = "unknown"; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5421 |
41322
482c520b29ba
(Vw32_system_coding_system): Remove.
Jason Rumney <jasonr@gnu.org>
parents:
41250
diff
changeset
|
5422 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
|
5423 &coding); |
29021
be2769eac1a5
(w32_to_x_font): Setup members src_multibyte and
Kenichi Handa <handa@m17n.org>
parents:
28983
diff
changeset
|
5424 coding.src_multibyte = 0; |
be2769eac1a5
(w32_to_x_font): Setup members src_multibyte and
Kenichi Handa <handa@m17n.org>
parents:
28983
diff
changeset
|
5425 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
|
5426 coding.mode |= CODING_MODE_LAST_BLOCK; |
45983
1f9be7a1addc
(w32_to_x_font): Disable composition handling.
Kenichi Handa <handa@m17n.org>
parents:
45963
diff
changeset
|
5427 /* We explicitely disable composition handling because selection |
1f9be7a1addc
(w32_to_x_font): Disable composition handling.
Kenichi Handa <handa@m17n.org>
parents:
45963
diff
changeset
|
5428 data should not contain any composition sequence. */ |
1f9be7a1addc
(w32_to_x_font): Disable composition handling.
Kenichi Handa <handa@m17n.org>
parents:
45963
diff
changeset
|
5429 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
|
5430 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
|
5431 |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
5432 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
|
5433 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
|
5434 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
|
5435 *(fontname + coding.produced) = '\0'; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5436 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5437 /* 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
|
5438 misinterpreted. */ |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5439 fontname_dash = fontname; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5440 while (fontname_dash = strchr (fontname_dash, '-')) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5441 *fontname_dash = '_'; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5442 |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5443 if (lplogfont->lfHeight) |
13434 | 5444 { |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5445 sprintf (height_pixels, "%u", abs (lplogfont->lfHeight)); |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5446 sprintf (height_dpi, "%u", |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5447 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
|
5448 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5449 else |
13434 | 5450 { |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5451 strcpy (height_pixels, "*"); |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5452 strcpy (height_dpi, "*"); |
13434 | 5453 } |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5454 if (lplogfont->lfWidth) |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5455 sprintf (width_pixels, "%u", lplogfont->lfWidth * 10); |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5456 else |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5457 strcpy (width_pixels, "*"); |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5458 |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5459 _snprintf (lpxstr, len - 1, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5460 "-%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
|
5461 fonttype, /* foundry */ |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5462 fontname, /* family */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5463 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
|
5464 lplogfont->lfItalic?'i':'r', /* slant */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5465 /* setwidth name */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5466 /* add style name */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5467 height_pixels, /* pixel size */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5468 height_dpi, /* point size */ |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5469 display_resx, /* resx */ |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5470 display_resy, /* resy */ |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5471 ((lplogfont->lfPitchAndFamily & 0x3) == VARIABLE_PITCH) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5472 ? 'p' : 'c', /* spacing */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5473 width_pixels, /* avg width */ |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5474 specific_charset ? specific_charset |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5475 : 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
|
5476 /* charset registry and encoding */ |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5477 ); |
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5478 |
13434 | 5479 lpxstr[len - 1] = 0; /* just to be sure */ |
5480 return (TRUE); | |
5481 } | |
5482 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5483 static BOOL |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5484 x_to_w32_font (lpxstr, lplogfont) |
13434 | 5485 char * lpxstr; |
5486 LOGFONT * lplogfont; | |
5487 { | |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
5488 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
|
5489 |
13434 | 5490 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
|
5491 |
13434 | 5492 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
|
5493 |
23620
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5494 /* 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
|
5495 #if 1 |
13434 | 5496 lplogfont->lfOutPrecision = OUT_DEFAULT_PRECIS; |
5497 lplogfont->lfClipPrecision = CLIP_DEFAULT_PRECIS; | |
5498 lplogfont->lfQuality = DEFAULT_QUALITY; | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5499 #else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5500 /* go for maximum quality */ |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5501 lplogfont->lfOutPrecision = OUT_STROKE_PRECIS; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5502 lplogfont->lfClipPrecision = CLIP_STROKE_PRECIS; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5503 lplogfont->lfQuality = PROOF_QUALITY; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5504 #endif |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5505 |
23620
2b55b8f8cdc1
(x_to_w32_font): Specify DEFAULT_CHARSET in the w32 LOGFONT struct if
Andrew Innes <andrewi@gnu.org>
parents:
23558
diff
changeset
|
5506 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
|
5507 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
|
5508 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
|
5509 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5510 if (!lpxstr) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5511 return FALSE; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5512 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5513 /* 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
|
5514 * 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
|
5515 * format: |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5516 * "<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
|
5517 */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5518 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5519 if (*lpxstr == '-') |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5520 { |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5521 int fields, tem; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5522 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
|
5523 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
|
5524 char * encoding; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
5525 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
|
5526 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5527 fields = sscanf (lpxstr, |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5528 "-%*[^-]-%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
|
5529 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
|
5530 if (fields == EOF) |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5531 return (FALSE); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5532 |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5533 /* 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
|
5534 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
|
5535 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
|
5536 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
|
5537 "-raster-6x10-*-gb2312*-*" |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5538 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
|
5539 if (fields == 3) |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5540 { |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5541 fields = sscanf (lpxstr, |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5542 "-%*[^-]-%49[^-]-*-%49s", |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5543 name, remainder); |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5544 } |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5545 else if (fields < 9) |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5546 { |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5547 fields = 0; |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5548 remainder[0] = 0; |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5549 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5550 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5551 if (fields > 0 && name[0] != '*') |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5552 { |
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
|
5553 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
|
5554 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
|
5555 |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
5556 setup_coding_system |
41322
482c520b29ba
(Vw32_system_coding_system): Remove.
Jason Rumney <jasonr@gnu.org>
parents:
41250
diff
changeset
|
5557 (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
|
5558 coding.src_multibyte = 1; |
be2769eac1a5
(w32_to_x_font): Setup members src_multibyte and
Kenichi Handa <handa@m17n.org>
parents:
28983
diff
changeset
|
5559 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
|
5560 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
|
5561 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
|
5562 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
|
5563 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
|
5564 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
|
5565 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
|
5566 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
|
5567 strcpy (lplogfont->lfFaceName, buf); |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5568 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5569 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5570 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5571 lplogfont->lfFaceName[0] = '\0'; |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5572 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5573 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5574 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5575 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5576 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
|
5577 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5578 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5579 |
33879
9bbea0dda9cd
(x_to_w32_font): Do not filter out italic fonts, as new
Jason Rumney <jasonr@gnu.org>
parents:
33870
diff
changeset
|
5580 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
|
5581 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5582 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5583 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5584 if (fields > 0 && pixels[0] != '*') |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5585 lplogfont->lfHeight = atoi (pixels); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5586 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5587 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5588 fields--; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5589 if (fields > 0 && resy[0] != '*') |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5590 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5591 tem = atoi (resy); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5592 if (tem > 0) dpi = tem; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5593 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5594 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5595 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
|
5596 lplogfont->lfHeight = atoi (height) * dpi / 720; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5597 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5598 if (fields > 0) |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5599 lplogfont->lfPitchAndFamily = |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5600 (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
|
5601 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5602 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5603 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5604 if (fields > 0 && width[0] != '*') |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5605 lplogfont->lfWidth = atoi (width) / 10; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5606 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5607 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5608 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5609 /* 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
|
5610 fails the test against xlfd-tight-regexp in fontset.el). */ |
14353 | 5611 { |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5612 int len = strlen (remainder); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5613 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
|
5614 remainder[len-1] = 0; |
13434 | 5615 } |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5616 encoding = remainder; |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5617 #if 0 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5618 if (strncmp (encoding, "*-", 2) == 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5619 encoding += 2; |
39548
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5620 #endif |
6192be048459
(x_to_w32_color): Fix argument to alloca.
Andrew Innes <andrewi@gnu.org>
parents:
39137
diff
changeset
|
5621 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
|
5622 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5623 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5624 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5625 int fields; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5626 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
|
5627 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5628 fields = sscanf (lpxstr, |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5629 "%99[^:]:%9[^:]:%9[^:]:%19s", |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5630 name, height, width, weight); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5631 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5632 if (fields == EOF) return (FALSE); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5633 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5634 if (fields > 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5635 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5636 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
|
5637 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
|
5638 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5639 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5640 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5641 lplogfont->lfFaceName[0] = 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5642 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5643 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5644 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5645 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5646 if (fields > 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5647 lplogfont->lfHeight = atoi (height); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5648 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5649 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5650 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5651 if (fields > 0) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5652 lplogfont->lfWidth = atoi (width); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5653 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5654 fields--; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5655 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
5656 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
|
5657 } |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5658 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
5659 /* 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
|
5660 lplogfont->lfHeight = - abs (lplogfont->lfHeight); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5661 |
13434 | 5662 return (TRUE); |
5663 } | |
5664 | |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5665 /* 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
|
5666 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
|
5667 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
|
5668 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
|
5669 */ |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
5670 static int |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
5671 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
|
5672 { |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
5673 int pixel_height, field_number; |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5674 char *read_from, *write_to; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5675 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5676 xassert (fontname); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5677 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5678 pixel_height = field_number = 0; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5679 write_to = NULL; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5680 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5681 /* Look for height fields. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5682 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
|
5683 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5684 if (*read_from == '-') |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5685 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5686 field_number++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5687 if (field_number == 7) /* Pixel height. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5688 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5689 read_from++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5690 write_to = read_from; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5691 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5692 /* Find end of field. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5693 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
|
5694 ; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5695 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5696 /* 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
|
5697 if (*read_from) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5698 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5699 *read_from = '\0'; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5700 read_from++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5701 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5702 pixel_height = atoi (write_to); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5703 /* Blank out field. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5704 if (read_from > write_to) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5705 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5706 *write_to = '-'; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5707 write_to++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5708 } |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5709 /* 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
|
5710 return now. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5711 else |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5712 return pixel_height; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5713 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5714 /* 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
|
5715 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
|
5716 if (pixel_height) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5717 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5718 /* Find end of point size field. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5719 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
|
5720 ; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5721 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5722 if (*read_from) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5723 read_from++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5724 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5725 /* Blank out the point size field. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5726 if (read_from > write_to) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5727 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5728 *write_to = '-'; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5729 write_to++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5730 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5731 else |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5732 return pixel_height; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5733 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5734 break; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5735 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5736 /* 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
|
5737 if (*read_from == '-') |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5738 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5739 read_from++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5740 break; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5741 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5742 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5743 else if (field_number == 8) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5744 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5745 /* 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
|
5746 height and convert that. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5747 int point_size; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5748 char *point_size_start = read_from++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5749 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5750 /* Find end of field. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5751 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
|
5752 ; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5753 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5754 if (*read_from) |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5755 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5756 *read_from = '\0'; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5757 read_from++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5758 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5759 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5760 point_size = atoi (point_size_start); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5761 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5762 /* Convert to pixel height. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5763 pixel_height = point_size |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5764 * 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
|
5765 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5766 /* Blank out this field and break. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5767 *write_to = '-'; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5768 write_to++; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5769 break; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5770 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5771 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5772 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5773 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5774 /* 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
|
5775 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
|
5776 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5777 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
|
5778 *write_to = *read_from; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5779 *write_to = '\0'; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5780 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5781 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5782 return pixel_height; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5783 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5784 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5785 /* Assume parameter 1 is fully qualified, no wildcards. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5786 static BOOL |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5787 w32_font_match (fontname, pattern) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5788 char * fontname; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5789 char * pattern; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5790 { |
35674
62b578dd28ce
(w32_font_match): Allocate three more bytes to regex
Kenichi Handa <handa@m17n.org>
parents:
35359
diff
changeset
|
5791 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
|
5792 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
|
5793 char *ptr; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5794 |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5795 /* 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
|
5796 strcpy (font_name_copy, fontname); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5797 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5798 ptr = regex; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5799 *ptr++ = '^'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5800 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5801 /* 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
|
5802 for (; *pattern; pattern++) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5803 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5804 if (*pattern == '?') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5805 *ptr++ = '.'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5806 else if (*pattern == '*') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5807 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5808 *ptr++ = '.'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5809 *ptr++ = '*'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5810 } |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
5811 else |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5812 *ptr++ = *pattern; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5813 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5814 *ptr = '$'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5815 *(ptr + 1) = '\0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5816 |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5817 /* 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
|
5818 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
|
5819 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
|
5820 pattern that declares the point height. |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5821 */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5822 { |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5823 int font_height, pattern_height; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5824 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5825 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
|
5826 pattern_height = xlfd_strip_height (regex); |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5827 |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5828 /* 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
|
5829 if the heights differ. */ |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5830 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
|
5831 return FALSE; |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5832 } |
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
5833 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5834 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
|
5835 font_name_copy) >= 0); |
13434 | 5836 } |
5837 | |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5838 /* 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
|
5839 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
|
5840 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
|
5841 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
|
5842 fall back on. |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5843 |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5844 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
|
5845 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
|
5846 each family. */ |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
5847 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5848 typedef struct enumfont_t |
13434 | 5849 { |
5850 HDC hdc; | |
5851 int numFonts; | |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5852 LOGFONT logfont; |
13434 | 5853 XFontStruct *size_ref; |
45465
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
5854 Lisp_Object pattern; |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5855 Lisp_Object list; |
13434 | 5856 } enumfont_t; |
5857 | |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5858 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5859 static void |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5860 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
|
5861 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5862 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
5863 static int CALLBACK |
13434 | 5864 enum_font_cb2 (lplf, lptm, FontType, lpef) |
5865 ENUMLOGFONT * lplf; | |
5866 NEWTEXTMETRIC * lptm; | |
5867 int FontType; | |
5868 enumfont_t * lpef; | |
5869 { | |
40873
f288d1d604a7
(enum_font_cb2): Use leading @ on face name to detect
Jason Rumney <jasonr@gnu.org>
parents:
40656
diff
changeset
|
5870 /* 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
|
5871 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
|
5872 return 1; |
f288d1d604a7
(enum_font_cb2): Use leading @ on face name to detect
Jason Rumney <jasonr@gnu.org>
parents:
40656
diff
changeset
|
5873 |
f288d1d604a7
(enum_font_cb2): Use leading @ on face name to detect
Jason Rumney <jasonr@gnu.org>
parents:
40656
diff
changeset
|
5874 /* 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
|
5875 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
|
5876 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
|
5877 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
|
5878 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
|
5879 && 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
|
5880 return 1; |
7fb50bbb61ad
(w32_to_x_charset): Increase size of XLFD charset buffer.
Jason Rumney <jasonr@gnu.org>
parents:
40385
diff
changeset
|
5881 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5882 /* 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
|
5883 if (lpef->logfont.lfCharSet != DEFAULT_CHARSET && |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5884 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
|
5885 return 1; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5886 |
45232
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
5887 if (FontType == RASTER_FONTTYPE) |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
5888 { |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
5889 /* 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
|
5890 int charset = lplf->elfLogFont.lfCharSet; |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
5891 if (charset == SHIFTJIS_CHARSET |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
5892 || charset == HANGEUL_CHARSET |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
5893 || charset == CHINESEBIG5_CHARSET |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
5894 || charset == GB2312_CHARSET |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
5895 #ifdef JOHAB_CHARSET |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
5896 || charset == JOHAB_CHARSET |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
5897 #endif |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
5898 ) |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
5899 return 1; |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
5900 } |
4413ac739ab9
(enum_font_cb2): Don't use DBCS raster fonts.
Jason Rumney <jasonr@gnu.org>
parents:
45009
diff
changeset
|
5901 |
13434 | 5902 { |
5903 char buf[100]; | |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5904 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
|
5905 Lisp_Object charset_list = Qnil; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5906 char *charset = NULL; |
13434 | 5907 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5908 /* 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
|
5909 if (FontType != RASTER_FONTTYPE) |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5910 { |
45465
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
5911 if (!NILP (lpef->pattern)) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5912 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5913 /* 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
|
5914 lplf->elfLogFont.lfHeight = lpef->logfont.lfHeight; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5915 lplf->elfLogFont.lfWidth = lpef->logfont.lfWidth; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5916 width = make_number (lpef->logfont.lfWidth); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5917 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5918 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5919 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5920 lplf->elfLogFont.lfHeight = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5921 lplf->elfLogFont.lfWidth = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5922 } |
15205
0f5d6cd72e21
(win_msg_worker): Use post_msg.
Richard M. Stallman <rms@gnu.org>
parents:
15148
diff
changeset
|
5923 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5924 |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
5925 /* 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
|
5926 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
|
5927 if (lplf->elfLogFont.lfHeight > 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5928 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5929 /* 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
|
5930 if (FontType == RASTER_FONTTYPE) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5931 lplf->elfLogFont.lfHeight = lptm->tmInternalLeading - lptm->tmHeight; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5932 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5933 lplf->elfLogFont.lfHeight = -lplf->elfLogFont.lfHeight; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5934 } |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
5935 |
45465
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
5936 if (!NILP (lpef->pattern)) |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5937 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
5938 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
|
5939 |
43207
2dc57fcf62e9
(enum_font_cb2): Don't let charsets unknown to Windows
Jason Rumney <jasonr@gnu.org>
parents:
42935
diff
changeset
|
5940 /* 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
|
5941 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
|
5942 if (charset |
2dc57fcf62e9
(enum_font_cb2): Don't let charsets unknown to Windows
Jason Rumney <jasonr@gnu.org>
parents:
42935
diff
changeset
|
5943 && strncmp (charset, "*-*", 3) != 0 |
2dc57fcf62e9
(enum_font_cb2): Don't let charsets unknown to Windows
Jason Rumney <jasonr@gnu.org>
parents:
42935
diff
changeset
|
5944 && 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
|
5945 && 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
|
5946 return 1; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5947 } |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
5948 |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5949 if (charset) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5950 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
|
5951 else |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5952 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
|
5953 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5954 /* Loop through the charsets. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5955 for ( ; CONSP (charset_list); charset_list = Fcdr (charset_list)) |
13434 | 5956 { |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5957 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
|
5958 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
|
5959 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5960 /* 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
|
5961 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
|
5962 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
|
5963 && 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
|
5964 && lplf->elfLogFont.lfItalic == FALSE) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5965 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5966 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
|
5967 charset, width); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5968 /* bold. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5969 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
|
5970 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
|
5971 charset, width); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5972 /* bold italic. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5973 lplf->elfLogFont.lfItalic = TRUE; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5974 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
|
5975 charset, width); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5976 /* italic. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5977 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
|
5978 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
|
5979 charset, width); |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5980 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5981 else |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5982 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
|
5983 charset, width); |
13434 | 5984 } |
5985 } | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
5986 |
40528
7fb50bbb61ad
(w32_to_x_charset): Increase size of XLFD charset buffer.
Jason Rumney <jasonr@gnu.org>
parents:
40385
diff
changeset
|
5987 return 1; |
13434 | 5988 } |
5989 | |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5990 static void |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5991 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
|
5992 enumfont_t * lpef; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5993 LOGFONT * logfont; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5994 char * match_charset; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5995 Lisp_Object width; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5996 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5997 char buf[100]; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5998 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
5999 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
|
6000 return; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6001 |
45465
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
6002 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
|
6003 || 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
|
6004 { |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6005 /* 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
|
6006 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
|
6007 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
|
6008 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
|
6009 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
|
6010 { |
45465
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
6011 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
|
6012 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
|
6013 lpef->numFonts++; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6014 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6015 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6016 } |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6017 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
6018 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6019 static int CALLBACK |
13434 | 6020 enum_font_cb1 (lplf, lptm, FontType, lpef) |
6021 ENUMLOGFONT * lplf; | |
6022 NEWTEXTMETRIC * lptm; | |
6023 int FontType; | |
6024 enumfont_t * lpef; | |
6025 { | |
6026 return EnumFontFamilies (lpef->hdc, | |
6027 lplf->elfLogFont.lfFaceName, | |
6028 (FONTENUMPROC) enum_font_cb2, | |
6029 (LPARAM) lpef); | |
6030 } | |
6031 | |
6032 | |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6033 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
|
6034 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
|
6035 ENUMLOGFONTEX * lplf; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6036 NEWTEXTMETRICEX * lptm; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6037 int font_type; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6038 enumfont_t * lpef; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6039 { |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6040 /* 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
|
6041 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
|
6042 enumerated seperately. */ |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6043 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
|
6044 font_type, lpef); |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6045 } |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6046 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6047 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
|
6048 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
|
6049 ENUMLOGFONTEX * lplf; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6050 NEWTEXTMETRICEX * lptm; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6051 int font_type; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6052 enumfont_t * lpef; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6053 { |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6054 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
|
6055 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
|
6056 = GetProcAddress ( gdi32, "EnumFontFamiliesExA"); |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6057 /* 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
|
6058 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
|
6059 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
|
6060 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
|
6061 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
|
6062 &lplf->elfLogFont, |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6063 (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
|
6064 (LPARAM) lpef, 0); |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6065 } |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6066 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6067 /* 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
|
6068 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
|
6069 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6070 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
|
6071 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6072 char *fontname, *ptnstr; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6073 Lisp_Object list, tem, newlist = Qnil; |
24670 | 6074 int n_fonts = 0; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6075 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6076 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
|
6077 ptnstr = SDATA (pattern); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6078 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6079 for ( ; CONSP (list); list = XCDR (list)) |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6080 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6081 tem = XCAR (list); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6082 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
|
6083 fontname = SDATA (XCAR (tem)); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6084 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
|
6085 fontname = SDATA (tem); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6086 else |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6087 continue; |
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 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
|
6090 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6091 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
|
6092 n_fonts++; |
49812
15e797b18d7f
(w32_list_bdf_fonts, w32_list_fonts): Negative
Jason Rumney <jasonr@gnu.org>
parents:
49600
diff
changeset
|
6093 if (max_names >= 0 && n_fonts >= max_names) |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6094 break; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6095 } |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6096 } |
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 return newlist; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6099 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6100 |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6101 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6102 /* 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
|
6103 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
|
6104 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
|
6105 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
|
6106 a device context to use for GetTextMetrics. |
49812
15e797b18d7f
(w32_list_bdf_fonts, w32_list_fonts): Negative
Jason Rumney <jasonr@gnu.org>
parents:
49600
diff
changeset
|
6107 MAXNAMES sets a limit on how many fonts to match. If MAXNAMES is |
15e797b18d7f
(w32_list_bdf_fonts, w32_list_fonts): Negative
Jason Rumney <jasonr@gnu.org>
parents:
49600
diff
changeset
|
6108 negative, then all matching fonts are returned. */ |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6109 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6110 Lisp_Object |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
6111 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
|
6112 struct frame *f; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
6113 Lisp_Object pattern; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
6114 int size; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
6115 int maxnames; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6116 { |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6117 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
|
6118 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
|
6119 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
|
6120 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
|
6121 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6122 patterns = Fassoc (pattern, Valternate_fontname_alist); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6123 if (NILP (patterns)) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6124 patterns = Fcons (pattern, Qnil); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6125 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6126 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
|
6127 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6128 enumfont_t ef; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6129 int codepage; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6130 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6131 tpat = XCAR (patterns); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6132 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6133 if (!STRINGP (tpat)) |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6134 continue; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6135 |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6136 /* 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
|
6137 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
|
6138 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
|
6139 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
|
6140 && codepage != CP_DEFAULT && codepage != CP_UNKNOWN |
3a21ff35392b
(xlfd_charset_of_font): Don't overwrite fontname
Andrew Innes <andrewi@gnu.org>
parents:
34133
diff
changeset
|
6141 && !IsValidCodePage(codepage)) |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6142 continue; |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
6143 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6144 /* 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
|
6145 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
|
6146 ((PATTERN (FONTNAME . WIDTH) ...) ...) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6147 */ |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6148 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
|
6149 !NILP (list = Fassoc (tpat, tem))) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6150 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6151 list = Fcdr_safe (list); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6152 /* 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
|
6153 goto label_cached; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6154 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6155 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6156 BLOCK_INPUT; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6157 /* 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
|
6158 ef.pattern = tpat; |
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
6159 ef.list = Qnil; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6160 ef.numFonts = 0; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6161 |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6162 /* 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
|
6163 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
|
6164 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
|
6165 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
|
6166 { |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6167 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
|
6168 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
|
6169 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
|
6170 = GetProcAddress ( gdi32, "EnumFontFamiliesExA"); |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6171 |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6172 /* 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
|
6173 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
|
6174 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
|
6175 /* 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
|
6176 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
|
6177 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
|
6178 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6179 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
|
6180 |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6181 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
|
6182 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
|
6183 &font_match_pattern, |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6184 (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
|
6185 (LPARAM) &ef, 0); |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6186 else |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6187 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
|
6188 (LPARAM)&ef); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6189 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6190 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
|
6191 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6192 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6193 UNBLOCK_INPUT; |
45465
84120e75baa0
* w32fns.c (enumfont_t): Remove tail, make pattern a normal
Jason Rumney <jasonr@gnu.org>
parents:
45454
diff
changeset
|
6194 list = ef.list; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6195 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6196 /* 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
|
6197 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
|
6198 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
|
6199 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
|
6200 XCDR (dpyinfo->name_list_element))); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6201 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6202 label_cached: |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6203 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
|
6204 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6205 newlist = second_best = Qnil; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6206 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6207 /* 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
|
6208 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
|
6209 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6210 int found_size; |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6211 tem = XCAR (list); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6212 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6213 if (!CONSP (tem)) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6214 continue; |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6215 if (NILP (XCAR (tem))) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6216 continue; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6217 if (!size) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6218 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6219 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
|
6220 n_fonts++; |
49812
15e797b18d7f
(w32_list_bdf_fonts, w32_list_fonts): Negative
Jason Rumney <jasonr@gnu.org>
parents:
49600
diff
changeset
|
6221 if (maxnames >= 0 && n_fonts >= maxnames) |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6222 break; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6223 else |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6224 continue; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6225 } |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6226 if (!INTEGERP (XCDR (tem))) |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6227 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6228 /* 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
|
6229 load it and try GetTextMetrics. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6230 W32FontStruct thisinfo; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6231 LOGFONT lf; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6232 HDC hdc; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6233 HANDLE oldobj; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6234 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6235 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
|
6236 continue; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6237 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6238 BLOCK_INPUT; |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6239 thisinfo.bdf = NULL; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6240 thisinfo.hfont = CreateFontIndirect (&lf); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6241 if (thisinfo.hfont == NULL) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6242 continue; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6243 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6244 hdc = GetDC (dpyinfo->root_window); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6245 oldobj = SelectObject (hdc, thisinfo.hfont); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6246 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
|
6247 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
|
6248 else |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39812
diff
changeset
|
6249 XSETCDR (tem, make_number (0)); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6250 SelectObject (hdc, oldobj); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6251 ReleaseDC (dpyinfo->root_window, hdc); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6252 DeleteObject(thisinfo.hfont); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6253 UNBLOCK_INPUT; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6254 } |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6255 found_size = XINT (XCDR (tem)); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6256 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
|
6257 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6258 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
|
6259 n_fonts++; |
49812
15e797b18d7f
(w32_list_bdf_fonts, w32_list_fonts): Negative
Jason Rumney <jasonr@gnu.org>
parents:
49600
diff
changeset
|
6260 if (maxnames >= 0 && n_fonts >= maxnames) |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6261 break; |
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6262 } |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6263 /* 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
|
6264 no exact match is found. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6265 else if (found_size > 0) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6266 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6267 if (NILP (second_best)) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6268 second_best = tem; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6269 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6270 else if (found_size < size) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6271 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6272 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
|
6273 || 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
|
6274 second_best = tem; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6275 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6276 else |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6277 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6278 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
|
6279 && XINT (XCDR (second_best)) > |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6280 found_size) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6281 second_best = tem; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6282 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6283 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6284 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6285 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6286 if (!NILP (newlist)) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6287 break; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6288 else if (!NILP (second_best)) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6289 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6290 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
|
6291 break; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6292 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6293 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6294 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6295 /* Include any bdf fonts. */ |
49812
15e797b18d7f
(w32_list_bdf_fonts, w32_list_fonts): Negative
Jason Rumney <jasonr@gnu.org>
parents:
49600
diff
changeset
|
6296 if (n_fonts < maxnames || maxnames < 0) |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6297 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6298 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
|
6299 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
|
6300 combined[1] = newlist; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6301 newlist = Fnconc(2, combined); |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6302 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6303 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6304 return newlist; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6305 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6306 |
24214
4fb0bce809bc
(w32_load_system_font): Do not load unlisted fonts if
Geoff Voelker <voelker@cs.washington.edu>
parents:
24211
diff
changeset
|
6307 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6308 /* 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
|
6309 struct font_info * |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6310 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
|
6311 FRAME_PTR f; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6312 int font_idx; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6313 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6314 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
|
6315 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6316 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6317 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6318 struct font_info* |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6319 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
|
6320 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6321 int i; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6322 struct font_info *pfi; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6323 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6324 pfi = FRAME_W32_FONT_TABLE (f); |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6325 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6326 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
|
6327 { |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6328 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
|
6329 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6330 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6331 return NULL; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6332 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6333 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6334 /* 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
|
6335 `encoder' of the structure. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6336 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6337 void |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6338 w32_find_ccl_program (fontp) |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6339 struct font_info *fontp; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6340 { |
25069
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
6341 Lisp_Object list, elt; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6342 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6343 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
|
6344 { |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6345 elt = XCAR (list); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6346 if (CONSP (elt) |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6347 && STRINGP (XCAR (elt)) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6348 && (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
|
6349 >= 0)) |
25069
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
6350 break; |
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
6351 } |
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
6352 if (! NILP (list)) |
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
6353 { |
25084
d89aa269255d
(w32_find_ccl_program): Add casting.
Kenichi Handa <handa@m17n.org>
parents:
25069
diff
changeset
|
6354 struct ccl_program *ccl |
d89aa269255d
(w32_find_ccl_program): Add casting.
Kenichi Handa <handa@m17n.org>
parents:
25069
diff
changeset
|
6355 = (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
|
6356 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6357 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
|
6358 xfree (ccl); |
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
6359 else |
ee9bfbc340ba
(w32_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24856
diff
changeset
|
6360 fontp->font_encoder = ccl; |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6361 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6362 } |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6363 |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
6364 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6365 /* 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
|
6366 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
|
6367 static Lisp_Object |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6368 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
|
6369 { |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6370 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
|
6371 char fontname[100]; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6372 |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6373 if (!STRINGP(directory)) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6374 return Qnil; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6375 |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6376 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
|
6377 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
|
6378 |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6379 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
|
6380 { |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6381 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
|
6382 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
|
6383 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
|
6384 } |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6385 return list; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6386 } |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
6387 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6388 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
|
6389 1, 1, 0, |
41019 | 6390 doc: /* Return a list of BDF fonts in DIR. |
6391 The list is suitable for appending to w32-bdf-filename-alist. Fonts | |
6392 which do not contain an xlfd description will not be included in the | |
6393 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
|
6394 (directory) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6395 Lisp_Object directory; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6396 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6397 Lisp_Object list = Qnil; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6398 struct gcpro gcpro1, gcpro2; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6399 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6400 if (!CONSP (directory)) |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6401 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
|
6402 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6403 for ( ; CONSP (directory); directory = XCDR (directory)) |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6404 { |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6405 Lisp_Object pair[2]; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6406 pair[0] = list; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6407 pair[1] = Qnil; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6408 GCPRO2 (directory, list); |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6409 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
|
6410 list = Fnconc( 2, pair ); |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6411 UNGCPRO; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6412 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6413 return list; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6414 } |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6415 |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
6416 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
25646
diff
changeset
|
6417 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
|
6418 doc: /* Internal function called by `color-defined-p', which see. */) |
13434 | 6419 (color, frame) |
6420 Lisp_Object color, frame; | |
6421 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6422 XColor foo; |
13434 | 6423 FRAME_PTR f = check_x_frame (frame); |
6424 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
6425 CHECK_STRING (color); |
13434 | 6426 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6427 if (w32_defined_color (f, SDATA (color), &foo, 0)) |
13434 | 6428 return Qt; |
6429 else | |
6430 return Qnil; | |
6431 } | |
6432 | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
25646
diff
changeset
|
6433 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
|
6434 doc: /* Internal function called by `color-values', which see. */) |
13434 | 6435 (color, frame) |
6436 Lisp_Object color, frame; | |
6437 { | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6438 XColor foo; |
13434 | 6439 FRAME_PTR f = check_x_frame (frame); |
6440 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
6441 CHECK_STRING (color); |
13434 | 6442 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6443 if (w32_defined_color (f, SDATA (color), &foo, 0)) |
13434 | 6444 { |
6445 Lisp_Object rgb[3]; | |
6446 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6447 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
|
6448 | GetRValue (foo.pixel)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6449 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
|
6450 | GetGValue (foo.pixel)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6451 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
|
6452 | GetBValue (foo.pixel)); |
13434 | 6453 return Flist (3, rgb); |
6454 } | |
6455 else | |
6456 return Qnil; | |
6457 } | |
6458 | |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
25646
diff
changeset
|
6459 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
|
6460 doc: /* Internal function called by `display-color-p', which see. */) |
13434 | 6461 (display) |
6462 Lisp_Object display; | |
6463 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6464 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 6465 |
6466 if ((dpyinfo->n_planes * dpyinfo->n_cbits) <= 2) | |
6467 return Qnil; | |
6468 | |
6469 return Qt; | |
6470 } | |
6471 | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
6472 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
|
6473 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
|
6474 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
|
6475 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
|
6476 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
|
6477 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
|
6478 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 6479 (display) |
6480 Lisp_Object display; | |
6481 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6482 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 6483 |
6484 if ((dpyinfo->n_planes * dpyinfo->n_cbits) <= 1) | |
6485 return Qnil; | |
6486 | |
6487 return Qt; | |
6488 } | |
6489 | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
6490 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
|
6491 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
|
6492 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
|
6493 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
|
6494 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
|
6495 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 6496 (display) |
6497 Lisp_Object display; | |
6498 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6499 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 6500 |
6501 return make_number (dpyinfo->width); | |
6502 } | |
6503 | |
6504 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
|
6505 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
|
6506 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
|
6507 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
|
6508 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
|
6509 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 6510 (display) |
6511 Lisp_Object display; | |
6512 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6513 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 6514 |
6515 return make_number (dpyinfo->height); | |
6516 } | |
6517 | |
6518 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
|
6519 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
|
6520 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
|
6521 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
|
6522 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
|
6523 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 6524 (display) |
6525 Lisp_Object display; | |
6526 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6527 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 6528 |
6529 return make_number (dpyinfo->n_planes * dpyinfo->n_cbits); | |
6530 } | |
6531 | |
6532 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
|
6533 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
|
6534 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
|
6535 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
|
6536 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
|
6537 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 6538 (display) |
6539 Lisp_Object display; | |
6540 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6541 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 6542 HDC hdc; |
6543 int cap; | |
6544 | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6545 hdc = GetDC (dpyinfo->root_window); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6546 if (dpyinfo->has_palette) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6547 cap = GetDeviceCaps (hdc,SIZEPALETTE); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6548 else |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6549 cap = GetDeviceCaps (hdc,NUMCOLORS); |
34998
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
6550 |
43773
8d3931ead0df
(Fx_display_color_cells): Force 24+ bit color depths to 24-bit.
Juanma Barranquero <lekktu@gmail.com>
parents:
43484
diff
changeset
|
6551 /* 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
|
6552 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
|
6553 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
|
6554 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
|
6555 |
13434 | 6556 ReleaseDC (dpyinfo->root_window, hdc); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6557 |
13434 | 6558 return make_number (cap); |
6559 } | |
6560 | |
6561 DEFUN ("x-server-max-request-size", Fx_server_max_request_size, | |
6562 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
|
6563 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
|
6564 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
|
6565 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
|
6566 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
|
6567 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 6568 (display) |
6569 Lisp_Object display; | |
6570 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6571 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 6572 |
6573 return make_number (1); | |
6574 } | |
6575 | |
6576 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
|
6577 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
|
6578 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
|
6579 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
|
6580 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 6581 (display) |
6582 Lisp_Object display; | |
6583 { | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6584 return build_string ("Microsoft Corp."); |
13434 | 6585 } |
6586 | |
6587 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
|
6588 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
|
6589 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
|
6590 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
|
6591 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
|
6592 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
6593 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
|
6594 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
|
6595 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 6596 (display) |
6597 Lisp_Object display; | |
6598 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6599 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
|
6600 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
|
6601 Fcons (make_number (w32_build_number), Qnil))); |
13434 | 6602 } |
6603 | |
6604 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
|
6605 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
|
6606 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
|
6607 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
|
6608 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 6609 (display) |
6610 Lisp_Object display; | |
6611 { | |
6612 return make_number (1); | |
6613 } | |
6614 | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
6615 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
|
6616 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
|
6617 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
|
6618 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
|
6619 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
|
6620 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 6621 (display) |
6622 Lisp_Object display; | |
6623 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6624 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 6625 HDC hdc; |
6626 int cap; | |
6627 | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6628 hdc = GetDC (dpyinfo->root_window); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6629 |
13434 | 6630 cap = GetDeviceCaps (hdc, VERTSIZE); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6631 |
13434 | 6632 ReleaseDC (dpyinfo->root_window, hdc); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6633 |
13434 | 6634 return make_number (cap); |
6635 } | |
6636 | |
6637 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
|
6638 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
|
6639 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
|
6640 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
|
6641 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 6642 (display) |
6643 Lisp_Object display; | |
6644 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6645 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 6646 |
6647 HDC hdc; | |
6648 int cap; | |
6649 | |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6650 hdc = GetDC (dpyinfo->root_window); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6651 |
13434 | 6652 cap = GetDeviceCaps (hdc, HORZSIZE); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6653 |
13434 | 6654 ReleaseDC (dpyinfo->root_window, hdc); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
6655 |
13434 | 6656 return make_number (cap); |
6657 } | |
6658 | |
6659 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
|
6660 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
|
6661 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
|
6662 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
|
6663 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
|
6664 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
|
6665 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 6666 (display) |
6667 Lisp_Object display; | |
6668 { | |
6669 return intern ("not-useful"); | |
6670 } | |
6671 | |
6672 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
|
6673 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
|
6674 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
|
6675 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
|
6676 `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
|
6677 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
6678 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
|
6679 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
|
6680 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 6681 (display) |
6682 Lisp_Object display; | |
6683 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6684 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
|
6685 Lisp_Object result = Qnil; |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
6686 |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
6687 if (dpyinfo->has_palette) |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
6688 result = intern ("pseudo-color"); |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
6689 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
|
6690 result = intern ("static-grey"); |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
6691 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
|
6692 result = intern ("static-color"); |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
6693 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
|
6694 result = intern ("true-color"); |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
6695 |
5091928844df
(Fx_display_color_cells): Determine correct value, when
Andrew Innes <andrewi@gnu.org>
parents:
34942
diff
changeset
|
6696 return result; |
13434 | 6697 } |
6698 | |
6699 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
|
6700 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
|
6701 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
|
6702 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
|
6703 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
|
6704 If omitted or nil, that stands for the selected frame's display. */) |
13434 | 6705 (display) |
6706 Lisp_Object display; | |
6707 { | |
6708 return Qnil; | |
6709 } | |
6710 | |
6711 int | |
6712 x_pixel_width (f) | |
6713 register struct frame *f; | |
6714 { | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
6715 return FRAME_PIXEL_WIDTH (f); |
13434 | 6716 } |
6717 | |
6718 int | |
6719 x_pixel_height (f) | |
6720 register struct frame *f; | |
6721 { | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
6722 return FRAME_PIXEL_HEIGHT (f); |
13434 | 6723 } |
6724 | |
6725 int | |
6726 x_char_width (f) | |
6727 register struct frame *f; | |
6728 { | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
6729 return FRAME_COLUMN_WIDTH (f); |
13434 | 6730 } |
6731 | |
6732 int | |
6733 x_char_height (f) | |
6734 register struct frame *f; | |
6735 { | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
6736 return FRAME_LINE_HEIGHT (f); |
13434 | 6737 } |
6738 | |
6739 int | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6740 x_screen_planes (f) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6741 register struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6742 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6743 return FRAME_W32_DISPLAY_INFO (f)->n_planes; |
13434 | 6744 } |
6745 | |
6746 /* Return the display structure for the display named NAME. | |
6747 Open a new connection if necessary. */ | |
6748 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6749 struct w32_display_info * |
13434 | 6750 x_display_info_for_name (name) |
6751 Lisp_Object name; | |
6752 { | |
6753 Lisp_Object names; | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6754 struct w32_display_info *dpyinfo; |
13434 | 6755 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
6756 CHECK_STRING (name); |
13434 | 6757 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6758 for (dpyinfo = &one_w32_display_info, names = w32_display_name_list; |
13434 | 6759 dpyinfo; |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6760 dpyinfo = dpyinfo->next, names = XCDR (names)) |
13434 | 6761 { |
6762 Lisp_Object tem; | |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6763 tem = Fstring_equal (XCAR (XCAR (names)), name); |
13434 | 6764 if (!NILP (tem)) |
6765 return dpyinfo; | |
6766 } | |
6767 | |
6768 /* Use this general default value to start with. */ | |
6769 Vx_resource_name = Vinvocation_name; | |
6770 | |
6771 validate_x_resource_name (); | |
6772 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6773 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
|
6774 (char *) SDATA (Vx_resource_name)); |
13434 | 6775 |
6776 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
|
6777 error ("Cannot connect to server %s", SDATA (name)); |
13434 | 6778 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
6779 w32_in_use = 1; |
13434 | 6780 XSETFASTINT (Vwindow_system_version, 3); |
6781 | |
6782 return dpyinfo; | |
6783 } | |
6784 | |
6785 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
|
6786 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
|
6787 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
|
6788 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
|
6789 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
|
6790 terminate Emacs if we can't open the connection. */) |
13434 | 6791 (display, xrm_string, must_succeed) |
6792 Lisp_Object display, xrm_string, must_succeed; | |
6793 { | |
6794 unsigned char *xrm_option; | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6795 struct w32_display_info *dpyinfo; |
13434 | 6796 |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
6797 /* 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
|
6798 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
|
6799 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
|
6800 return Qnil; |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
6801 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
6802 CHECK_STRING (display); |
13434 | 6803 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
|
6804 CHECK_STRING (xrm_string); |
13434 | 6805 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
6806 if (! EQ (Vwindow_system, intern ("w32"))) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
6807 error ("Not using Microsoft Windows"); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
6808 |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6809 /* 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
|
6810 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
|
6811 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6812 Lisp_Object color_file; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6813 struct gcpro gcpro1; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6814 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6815 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
|
6816 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6817 GCPRO1 (color_file); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6818 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6819 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
|
6820 color_file = |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6821 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
|
6822 Fsymbol_value (intern ("data-directory"))); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6823 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6824 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
|
6825 |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6826 UNGCPRO; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6827 } |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6828 if (NILP (Vw32_color_map)) |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6829 Vw32_color_map = Fw32_default_color_map (); |
13434 | 6830 |
51474
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
6831 /* Merge in system logical colors. */ |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
6832 add_system_logical_colors_to_map (&Vw32_color_map); |
0dbfd1fe2e91
(add_system_logical_colors_to_map): New function.
Jason Rumney <jasonr@gnu.org>
parents:
51211
diff
changeset
|
6833 |
13434 | 6834 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
|
6835 xrm_option = (unsigned char *) SDATA (xrm_string); |
13434 | 6836 else |
6837 xrm_option = (unsigned char *) 0; | |
6838 | |
6839 /* 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
|
6840 /* 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
|
6841 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6842 char basename[ MAX_PATH ], *str; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6843 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6844 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
|
6845 str = strrchr (basename, '.'); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6846 if (str) *str = 0; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6847 Vinvocation_name = build_string (basename); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
6848 } |
13434 | 6849 Vx_resource_name = Vinvocation_name; |
6850 | |
6851 validate_x_resource_name (); | |
6852 | |
6853 /* This is what opens the connection and sets x_current_display. | |
6854 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
|
6855 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
|
6856 (char *) SDATA (Vx_resource_name)); |
13434 | 6857 |
6858 if (dpyinfo == 0) | |
6859 { | |
6860 if (!NILP (must_succeed)) | |
14353 | 6861 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
|
6862 SDATA (display)); |
13434 | 6863 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6864 error ("Cannot connect to server %s", SDATA (display)); |
13434 | 6865 } |
6866 | |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
6867 w32_in_use = 1; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
6868 |
13434 | 6869 XSETFASTINT (Vwindow_system_version, 3); |
6870 return Qnil; | |
6871 } | |
6872 | |
6873 DEFUN ("x-close-connection", Fx_close_connection, | |
6874 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
|
6875 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
|
6876 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
|
6877 If DISPLAY is nil, that stands for the selected frame's display. */) |
13434 | 6878 (display) |
6879 Lisp_Object display; | |
6880 { | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
6881 struct w32_display_info *dpyinfo = check_x_display_info (display); |
13434 | 6882 int i; |
6883 | |
6884 if (dpyinfo->reference_count > 0) | |
6885 error ("Display still has frames on it"); | |
6886 | |
6887 BLOCK_INPUT; | |
6888 /* Free the fonts in the font table. */ | |
6889 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
|
6890 if (dpyinfo->font_table[i].name) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6891 { |
28272
f62bb21d38db
(w32_wnd_proc): Handle WM_MENUSELECT message.
Jason Rumney <jasonr@gnu.org>
parents:
27936
diff
changeset
|
6892 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
|
6893 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
|
6894 xfree (dpyinfo->font_table[i].name); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6895 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
|
6896 } |
13434 | 6897 x_destroy_all_bitmaps (dpyinfo); |
6898 | |
6899 x_delete_display (dpyinfo); | |
6900 UNBLOCK_INPUT; | |
6901 | |
6902 return Qnil; | |
6903 } | |
6904 | |
6905 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
|
6906 doc: /* Return the list of display names that Emacs has connections to. */) |
13434 | 6907 () |
6908 { | |
6909 Lisp_Object tail, result; | |
6910 | |
6911 result = Qnil; | |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25289
diff
changeset
|
6912 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
|
6913 result = Fcons (XCAR (XCAR (tail)), result); |
13434 | 6914 |
6915 return result; | |
6916 } | |
6917 | |
6918 DEFUN ("x-synchronize", Fx_synchronize, Sx_synchronize, 1, 2, 0, | |
41008 | 6919 doc: /* This is a noop on W32 systems. */) |
6920 (on, display) | |
6921 Lisp_Object display, on; | |
13434 | 6922 { |
6923 return Qnil; | |
6924 } | |
6925 | |
6926 | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6927 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6928 Image types |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6929 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6930 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6931 /* 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
|
6932 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6933 #define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6934 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6935 /* 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
|
6936 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
|
6937 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6938 static struct image_type *image_types; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6939 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6940 /* 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
|
6941 images in Lisp. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6942 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6943 extern Lisp_Object Qimage; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6944 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6945 /* 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
|
6946 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6947 Lisp_Object Qxbm; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6948 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6949 /* Keywords. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6950 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6951 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
|
6952 extern Lisp_Object QCdata, QCtype; |
85388a495f68
(QCtype): Remove duplicate declaration and
Kim F. Storm <storm@cua.dk>
parents:
44047
diff
changeset
|
6953 Lisp_Object QCascent, QCmargin, QCrelief; |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
6954 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
|
6955 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
|
6956 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6957 /* Other symbols. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6958 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
6959 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
|
6960 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6961 /* 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
|
6962 if not displayed. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6963 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6964 Lisp_Object Vimage_cache_eviction_delay; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6965 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6966 /* Function prototypes. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6967 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6968 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
|
6969 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
|
6970 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
|
6971 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
|
6972 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
|
6973 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
|
6974 Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6975 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
6976 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6977 /* 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
|
6978 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
|
6979 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6980 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6981 define_image_type (type) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6982 struct image_type *type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6983 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6984 /* 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
|
6985 The initialized data segment is read-only. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6986 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
|
6987 bcopy (type, p, sizeof *p); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6988 p->next = image_types; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6989 image_types = p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6990 Vimage_types = Fcons (*p->type, Vimage_types); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6991 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6992 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6993 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6994 /* 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
|
6995 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
|
6996 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6997 static INLINE struct image_type * |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6998 lookup_image_type (symbol) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
6999 Lisp_Object symbol; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7000 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7001 struct image_type *type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7002 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7003 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
|
7004 if (EQ (symbol, *type->type)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7005 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7006 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7007 return type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7008 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7009 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7010 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7011 /* 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
|
7012 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
|
7013 `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
|
7014 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
|
7015 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
|
7016 image type. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7017 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7018 int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7019 valid_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7020 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7021 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7022 int valid_p = 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7023 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7024 if (CONSP (object) && EQ (XCAR (object), Qimage)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7025 { |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7026 Lisp_Object tem; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7027 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7028 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
|
7029 if (EQ (XCAR (tem), QCtype)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7030 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7031 tem = XCDR (tem); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7032 if (CONSP (tem) && SYMBOLP (XCAR (tem))) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7033 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7034 struct image_type *type; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7035 type = lookup_image_type (XCAR (tem)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7036 if (type) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7037 valid_p = type->valid_p (object); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7038 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7039 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7040 break; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7041 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7042 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7043 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7044 return valid_p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7045 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7046 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7047 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7048 /* 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
|
7049 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
|
7050 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
|
7051 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
|
7052 therefore simply displays a message. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7053 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7054 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7055 image_error (format, arg1, arg2) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7056 char *format; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7057 Lisp_Object arg1, arg2; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7058 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7059 add_to_log (format, arg1, arg2); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7060 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7061 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7062 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7063 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7064 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7065 Image specifications |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7066 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7067 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7068 enum image_value_type |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7069 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7070 IMAGE_DONT_CHECK_VALUE_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7071 IMAGE_STRING_VALUE, |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7072 IMAGE_STRING_OR_NIL_VALUE, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7073 IMAGE_SYMBOL_VALUE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7074 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
|
7075 IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7076 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
|
7077 IMAGE_ASCENT_VALUE, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7078 IMAGE_INTEGER_VALUE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7079 IMAGE_FUNCTION_VALUE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7080 IMAGE_NUMBER_VALUE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7081 IMAGE_BOOL_VALUE |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7082 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7083 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7084 /* Structure used when parsing image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7085 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7086 struct image_keyword |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7087 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7088 /* Name of keyword. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7089 char *name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7090 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7091 /* The type of value allowed. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7092 enum image_value_type type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7093 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7094 /* Non-zero means key must be present. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7095 int mandatory_p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7096 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7097 /* 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
|
7098 int count; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7099 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7100 /* The value that was found. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7101 Lisp_Object value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7102 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7103 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7104 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7105 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
|
7106 int, Lisp_Object)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7107 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
|
7108 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7109 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7110 /* 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
|
7111 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
|
7112 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
|
7113 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
|
7114 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
|
7115 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7116 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7117 parse_image_spec (spec, keywords, nkeywords, type) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7118 Lisp_Object spec; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7119 struct image_keyword *keywords; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7120 int nkeywords; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7121 Lisp_Object type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7122 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7123 int i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7124 Lisp_Object plist; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7125 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7126 if (!CONSP (spec) || !EQ (XCAR (spec), Qimage)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7127 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7128 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7129 plist = XCDR (spec); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7130 while (CONSP (plist)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7131 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7132 Lisp_Object key, value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7133 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7134 /* 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
|
7135 key = XCAR (plist); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7136 plist = XCDR (plist); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7137 if (!SYMBOLP (key)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7138 return 0; |
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 /* There must follow a value. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7141 if (!CONSP (plist)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7142 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7143 value = XCAR (plist); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7144 plist = XCDR (plist); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7145 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7146 /* 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
|
7147 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
|
7148 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
|
7149 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7150 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7151 if (i == nkeywords) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7152 continue; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7153 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7154 /* 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
|
7155 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
|
7156 keywords[i].value = value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7157 ++keywords[i].count; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7158 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7159 if (keywords[i].count > 1) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7160 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7161 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7162 /* Check type of value against allowed type. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7163 switch (keywords[i].type) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7164 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7165 case IMAGE_STRING_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7166 if (!STRINGP (value)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7167 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7168 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7169 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7170 case IMAGE_STRING_OR_NIL_VALUE: |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7171 if (!STRINGP (value) && !NILP (value)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7172 return 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7173 break; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7174 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7175 case IMAGE_SYMBOL_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7176 if (!SYMBOLP (value)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7177 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7178 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7179 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7180 case IMAGE_POSITIVE_INTEGER_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7181 if (!INTEGERP (value) || XINT (value) <= 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7182 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7183 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7184 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7185 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
|
7186 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
|
7187 break; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7188 if (CONSP (value) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7189 && 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
|
7190 && 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
|
7191 break; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7192 return 0; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7193 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7194 case IMAGE_ASCENT_VALUE: |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7195 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
|
7196 break; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7197 else if (INTEGERP (value) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7198 && XINT (value) >= 0 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7199 && XINT (value) <= 100) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7200 break; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7201 return 0; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7202 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7203 case IMAGE_NON_NEGATIVE_INTEGER_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7204 if (!INTEGERP (value) || XINT (value) < 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7205 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7206 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7207 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7208 case IMAGE_DONT_CHECK_VALUE_TYPE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7209 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7210 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7211 case IMAGE_FUNCTION_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7212 value = indirect_function (value); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7213 if (SUBRP (value) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7214 || COMPILEDP (value) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7215 || (CONSP (value) && EQ (XCAR (value), Qlambda))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7216 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7217 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7218 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7219 case IMAGE_NUMBER_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7220 if (!INTEGERP (value) && !FLOATP (value)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7221 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7222 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7223 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7224 case IMAGE_INTEGER_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7225 if (!INTEGERP (value)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7226 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7227 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7228 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7229 case IMAGE_BOOL_VALUE: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7230 if (!NILP (value) && !EQ (value, Qt)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7231 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7232 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7233 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7234 default: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7235 abort (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7236 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7237 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7238 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7239 if (EQ (key, QCtype) && !EQ (type, value)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7240 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7241 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7242 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7243 /* Check that all mandatory fields are present. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7244 for (i = 0; i < nkeywords; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7245 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
|
7246 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7247 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7248 return NILP (plist); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7249 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7250 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7251 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7252 /* 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
|
7253 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
|
7254 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
|
7255 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7256 static Lisp_Object |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7257 image_spec_value (spec, key, found) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7258 Lisp_Object spec, key; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7259 int *found; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7260 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7261 Lisp_Object tail; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7262 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7263 xassert (valid_image_p (spec)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7264 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7265 for (tail = XCDR (spec); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7266 CONSP (tail) && CONSP (XCDR (tail)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7267 tail = XCDR (XCDR (tail))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7268 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7269 if (EQ (XCAR (tail), key)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7270 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7271 if (found) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7272 *found = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7273 return XCAR (XCDR (tail)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7274 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7275 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7276 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7277 if (found) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7278 *found = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7279 return Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7280 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7281 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7282 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7283 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
|
7284 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
|
7285 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
|
7286 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
|
7287 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
|
7288 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
|
7289 (spec, pixels, frame) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7290 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
|
7291 { |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7292 Lisp_Object size; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7293 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7294 size = Qnil; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7295 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
|
7296 { |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7297 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
|
7298 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
|
7299 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
|
7300 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
|
7301 int height = img->height + 2 * img->vmargin; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7302 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7303 if (NILP (pixels)) |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
7304 size = Fcons (make_float ((double) width / FRAME_COLUMN_WIDTH (f)), |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
7305 make_float ((double) height / FRAME_LINE_HEIGHT (f))); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7306 else |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7307 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
|
7308 } |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7309 else |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7310 error ("Invalid image specification"); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7311 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7312 return size; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7313 } |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7314 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7315 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7316 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
|
7317 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
|
7318 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
|
7319 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
|
7320 (spec, frame) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7321 Lisp_Object spec, frame; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7322 { |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7323 Lisp_Object mask; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7324 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7325 mask = Qnil; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7326 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
|
7327 { |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7328 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
|
7329 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
|
7330 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
|
7331 if (img->mask) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7332 mask = Qt; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7333 } |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7334 else |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7335 error ("Invalid image specification"); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7336 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7337 return mask; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7338 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7339 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7340 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7341 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7342 Image type independent image structures |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7343 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7344 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7345 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
|
7346 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
|
7347 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
|
7348 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7349 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7350 /* 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
|
7351 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
|
7352 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7353 static struct image * |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7354 make_image (spec, hash) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7355 Lisp_Object spec; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7356 unsigned hash; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7357 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7358 struct image *img = (struct image *) xmalloc (sizeof *img); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7359 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7360 xassert (valid_image_p (spec)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7361 bzero (img, sizeof *img); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7362 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
|
7363 xassert (img->type != NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7364 img->spec = spec; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7365 img->data.lisp_val = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7366 img->ascent = DEFAULT_IMAGE_ASCENT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7367 img->hash = hash; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7368 return img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7369 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7370 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7371 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7372 /* 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
|
7373 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7374 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7375 free_image (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7376 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7377 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7378 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7379 if (img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7380 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7381 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
|
7382 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7383 /* 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
|
7384 if (img->prev) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7385 img->prev->next = img->next; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7386 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7387 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
|
7388 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7389 if (img->next) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7390 img->next->prev = img->prev; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7391 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7392 c->images[img->id] = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7393 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7394 /* Free resources, then free IMG. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7395 img->type->free (f, img); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7396 xfree (img); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7397 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7398 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7399 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7400 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7401 /* 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
|
7402 drawing an image. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7403 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7404 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7405 prepare_image_for_display (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7406 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7407 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7408 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7409 EMACS_TIME t; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7410 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7411 /* 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
|
7412 EMACS_GET_TIME (t); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7413 img->timestamp = EMACS_SECS (t); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7414 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7415 /* 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
|
7416 type dependent loader function. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7417 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
|
7418 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
|
7419 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7420 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7421 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7422 /* 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
|
7423 drawn in face FACE. */ |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7424 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7425 int |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7426 image_ascent (img, face) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7427 struct image *img; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7428 struct face *face; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7429 { |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7430 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
|
7431 int ascent; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7432 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7433 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
|
7434 { |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7435 if (face->font) |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7436 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
|
7437 - 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
|
7438 else |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7439 ascent = height / 2; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7440 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7441 else |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7442 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
|
7443 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7444 return ascent; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7445 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7446 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
7447 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7448 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7449 /* Image background colors. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7450 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7451 /* 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
|
7452 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
|
7453 static COLORREF |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7454 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
|
7455 HDC img_dc; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7456 unsigned long width, height; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7457 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7458 COLORREF corners[4], best; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7459 int i, best_count; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7460 |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7461 /* 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
|
7462 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
|
7463 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
|
7464 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
|
7465 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
|
7466 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7467 /* 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
|
7468 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
|
7469 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7470 int j, n; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7471 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7472 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
|
7473 if (corners[i] == corners[j]) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7474 ++n; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7475 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7476 if (n > best_count) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7477 best = corners[i], best_count = n; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7478 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7479 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7480 return best; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7481 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7482 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7483 /* 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
|
7484 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
|
7485 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
|
7486 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7487 unsigned long |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7488 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
|
7489 struct image *img; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7490 struct frame *f; |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7491 HDC img_dc; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7492 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7493 if (! img->background_valid) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7494 /* 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
|
7495 { |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7496 int free_ximg = !img_dc; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7497 HGDIOBJ prev; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7498 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7499 if (free_ximg) |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7500 { |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7501 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
|
7502 img_dc = CreateCompatibleDC (frame_dc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7503 release_frame_dc (f, frame_dc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7504 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7505 prev = SelectObject (img_dc, img->pixmap); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7506 } |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7507 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7508 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
|
7509 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7510 if (free_ximg) |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7511 { |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7512 SelectObject (img_dc, prev); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7513 DeleteDC (img_dc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7514 } |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7515 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7516 img->background_valid = 1; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7517 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7518 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7519 return img->background; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7520 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7521 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7522 /* 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
|
7523 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
|
7524 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
|
7525 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7526 int |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7527 image_background_transparent (img, f, mask) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7528 struct image *img; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7529 struct frame *f; |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7530 HDC mask; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7531 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7532 if (! img->background_transparent_valid) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7533 /* 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
|
7534 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7535 if (img->mask) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7536 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7537 int free_mask = !mask; |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7538 HGDIOBJ prev; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7539 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7540 if (free_mask) |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7541 { |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7542 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
|
7543 mask = CreateCompatibleDC (frame_dc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7544 release_frame_dc (f, frame_dc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7545 |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
7546 prev = SelectObject (mask, img->mask); |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7547 } |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7548 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7549 img->background_transparent |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7550 = !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
|
7551 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7552 if (free_mask) |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7553 { |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7554 SelectObject (mask, prev); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7555 DeleteDC (mask); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
7556 } |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7557 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7558 else |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7559 img->background_transparent = 0; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7560 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7561 img->background_transparent_valid = 1; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7562 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7563 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7564 return img->background_transparent; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7565 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7566 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7567 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7568 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7569 Helper functions for X image types |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7570 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7571 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7572 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
|
7573 int, int)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7574 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
|
7575 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
|
7576 struct image *img, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7577 Lisp_Object color_name, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7578 unsigned long dflt)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7579 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7580 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7581 /* 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
|
7582 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
|
7583 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
|
7584 the image, if any. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7585 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7586 static void |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7587 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
|
7588 struct frame *f; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7589 struct image *img; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7590 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
|
7591 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7592 if (pixmap_p && img->pixmap) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7593 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7594 DeleteObject (img->pixmap); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7595 img->pixmap = NULL; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7596 img->background_valid = 0; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7597 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7598 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7599 if (mask_p && img->mask) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7600 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7601 DeleteObject (img->mask); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7602 img->mask = NULL; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7603 img->background_transparent_valid = 0; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7604 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7605 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7606 if (colors_p && img->ncolors) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7607 { |
44076
13f77e440e6e
(x_clear_image_1): Disable color table code.
Jason Rumney <jasonr@gnu.org>
parents:
44068
diff
changeset
|
7608 #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
|
7609 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
|
7610 #endif |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7611 xfree (img->colors); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7612 img->colors = NULL; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7613 img->ncolors = 0; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7614 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7615 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7616 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7617 /* 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
|
7618 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7619 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7620 x_clear_image (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7621 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7622 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7623 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7624 if (img->pixmap) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7625 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7626 BLOCK_INPUT; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7627 DeleteObject (img->pixmap); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7628 img->pixmap = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7629 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7630 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7631 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7632 if (img->ncolors) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7633 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7634 #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
|
7635 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7636 int class = FRAME_W32_DISPLAY_INFO (f)->visual->class; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7637 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7638 /* 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
|
7639 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
|
7640 if (class != StaticColor |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7641 && class != StaticGray |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7642 && class != TrueColor) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7643 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7644 Colormap cmap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7645 BLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7646 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
|
7647 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
|
7648 img->ncolors, 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7649 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7650 } |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7651 #endif |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7652 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7653 xfree (img->colors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7654 img->colors = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7655 img->ncolors = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7656 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7657 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7658 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7659 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7660 /* 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
|
7661 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
|
7662 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
|
7663 color. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7664 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7665 static unsigned long |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7666 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
|
7667 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7668 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7669 Lisp_Object color_name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7670 unsigned long dflt; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7671 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7672 XColor color; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7673 unsigned long result; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7674 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7675 xassert (STRINGP (color_name)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7676 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7677 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
|
7678 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7679 /* 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
|
7680 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
|
7681 ++img->ncolors; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7682 img->colors = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7683 (unsigned long *) xrealloc (img->colors, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7684 img->ncolors * sizeof *img->colors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7685 img->colors[img->ncolors - 1] = color.pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7686 result = color.pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7687 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7688 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7689 result = dflt; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7690 return result; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7691 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7692 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7693 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7694 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7695 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7696 Image Cache |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7697 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7698 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7699 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
|
7700 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
|
7701 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
|
7702 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7703 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7704 /* 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
|
7705 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
|
7706 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7707 struct image_cache * |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7708 make_image_cache () |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7709 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7710 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
|
7711 int size; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7712 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7713 bzero (c, sizeof *c); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7714 c->size = 50; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7715 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
|
7716 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
|
7717 c->buckets = (struct image **) xmalloc (size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7718 bzero (c->buckets, size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7719 return c; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7720 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7721 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7722 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7723 /* 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
|
7724 caches. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7725 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7726 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7727 free_image_cache (f) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7728 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7729 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7730 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
|
7731 if (c) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7732 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7733 int i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7734 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7735 /* 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
|
7736 xassert (c->refcount == 0); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7737 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7738 for (i = 0; i < c->used; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7739 free_image (f, c->images[i]); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7740 xfree (c->images); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7741 xfree (c); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7742 xfree (c->buckets); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7743 FRAME_X_IMAGE_CACHE (f) = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7744 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7745 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7746 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7747 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7748 /* 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
|
7749 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
|
7750 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
|
7751 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
|
7752 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
|
7753 at least that many seconds. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7754 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7755 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7756 clear_image_cache (f, force_p) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7757 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7758 int force_p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7759 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7760 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
|
7761 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7762 if (c && INTEGERP (Vimage_cache_eviction_delay)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7763 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7764 EMACS_TIME t; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7765 unsigned long old; |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7766 int i, nfreed; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7767 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7768 EMACS_GET_TIME (t); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7769 old = EMACS_SECS (t) - XFASTINT (Vimage_cache_eviction_delay); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7770 |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7771 /* 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
|
7772 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
|
7773 BLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7774 |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7775 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
|
7776 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7777 struct image *img = c->images[i]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7778 if (img != NULL |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7779 && (force_p || (img->timestamp < old))) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7780 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7781 free_image (f, img); |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7782 ++nfreed; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7783 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7784 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7785 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7786 /* 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
|
7787 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
|
7788 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
|
7789 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
|
7790 if (nfreed) |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7791 { |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7792 Lisp_Object tail, frame; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7793 |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7794 FOR_EACH_FRAME (tail, frame) |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7795 { |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7796 struct frame *f = XFRAME (frame); |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7797 if (FRAME_W32_P (f) |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7798 && 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
|
7799 clear_current_matrices (f); |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7800 } |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7801 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7802 ++windows_or_buffers_changed; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7803 } |
44094
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7804 |
16eb7bad861d
(x_set_cursor_color): Set cursor_gc as well.
Jason Rumney <jasonr@gnu.org>
parents:
44076
diff
changeset
|
7805 UNBLOCK_INPUT; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7806 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7807 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7808 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7809 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7810 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
|
7811 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
|
7812 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
|
7813 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
|
7814 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
|
7815 (frame) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7816 Lisp_Object frame; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7817 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7818 if (EQ (frame, Qt)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7819 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7820 Lisp_Object tail; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7821 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7822 FOR_EACH_FRAME (tail, frame) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7823 if (FRAME_W32_P (XFRAME (frame))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7824 clear_image_cache (XFRAME (frame), 1); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7825 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7826 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7827 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
|
7828 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7829 return Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7830 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7831 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7832 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7833 /* 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
|
7834 by the image's specification, */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7835 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7836 static void |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7837 postprocess_image (f, img) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7838 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7839 struct image *img; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7840 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7841 /* Manipulation of the image's mask. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7842 if (img->pixmap) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7843 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7844 Lisp_Object conversion, spec; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7845 Lisp_Object mask; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7846 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7847 spec = img->spec; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7848 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7849 /* `:heuristic-mask t' |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7850 `:mask heuristic' |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7851 means build a mask heuristically. |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7852 `:heuristic-mask (R G B)' |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7853 `:mask (heuristic (R G B))' |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7854 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
|
7855 image. |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7856 `:mask nil' |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7857 means remove a mask, if any. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7858 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7859 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
|
7860 if (!NILP (mask)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7861 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
|
7862 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7863 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7864 int found_p; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7865 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7866 mask = image_spec_value (spec, QCmask, &found_p); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7867 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7868 if (EQ (mask, Qheuristic)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7869 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
|
7870 else if (CONSP (mask) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7871 && EQ (XCAR (mask), Qheuristic)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7872 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7873 if (CONSP (XCDR (mask))) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7874 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
|
7875 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7876 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
|
7877 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7878 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
|
7879 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
7880 DeleteObject (img->mask); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7881 img->mask = NULL; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7882 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7883 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7884 |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7885 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7886 /* 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
|
7887 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
|
7888 if (EQ (conversion, Qdisabled)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7889 x_disable_image (f, img); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7890 else if (EQ (conversion, Qlaplace)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7891 x_laplace (f, img); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7892 else if (EQ (conversion, Qemboss)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7893 x_emboss (f, img); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7894 else if (CONSP (conversion) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7895 && EQ (XCAR (conversion), Qedge_detection)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7896 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7897 Lisp_Object tem; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7898 tem = XCDR (conversion); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7899 if (CONSP (tem)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7900 x_edge_detection (f, img, |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7901 Fplist_get (tem, QCmatrix), |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7902 Fplist_get (tem, QCcolor_adjustment)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7903 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7904 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7905 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7906 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7907 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7908 /* 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
|
7909 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
|
7910 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7911 int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7912 lookup_image (f, spec) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7913 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7914 Lisp_Object spec; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7915 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7916 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
|
7917 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7918 int i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7919 unsigned hash; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7920 struct gcpro gcpro1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7921 EMACS_TIME now; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7922 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7923 /* 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
|
7924 specification. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7925 xassert (FRAME_WINDOW_P (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7926 xassert (valid_image_p (spec)); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7927 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7928 GCPRO1 (spec); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7929 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7930 /* 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
|
7931 hash = sxhash (spec, 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7932 i = hash % IMAGE_CACHE_BUCKETS_SIZE; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7933 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7934 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
|
7935 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
|
7936 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7937 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7938 /* 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
|
7939 if (img == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7940 { |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7941 extern Lisp_Object Qpostscript; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
7942 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7943 BLOCK_INPUT; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7944 img = make_image (spec, hash); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7945 cache_image (f, img); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7946 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
|
7947 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7948 /* 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
|
7949 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
|
7950 draw a rectangle for it. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7951 if (img->load_failed_p) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7952 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7953 Lisp_Object value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7954 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7955 value = image_spec_value (spec, QCwidth, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7956 img->width = (INTEGERP (value) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7957 ? XFASTINT (value) : DEFAULT_IMAGE_WIDTH); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7958 value = image_spec_value (spec, QCheight, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7959 img->height = (INTEGERP (value) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7960 ? XFASTINT (value) : DEFAULT_IMAGE_HEIGHT); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7961 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7962 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7963 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7964 /* 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
|
7965 `: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
|
7966 `:background COLOR'. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7967 Lisp_Object ascent, margin, relief, bg; |
27397
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 ascent = image_spec_value (spec, QCascent, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7970 if (INTEGERP (ascent)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7971 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
|
7972 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
|
7973 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
|
7974 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7975 margin = image_spec_value (spec, QCmargin, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7976 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
|
7977 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
|
7978 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
|
7979 && INTEGERP (XCDR (margin))) |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7980 { |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
7981 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
|
7982 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
|
7983 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
|
7984 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
|
7985 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
7986 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7987 relief = image_spec_value (spec, QCrelief, NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7988 if (INTEGERP (relief)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7989 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7990 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
|
7991 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
|
7992 img->vmargin += abs (img->relief); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7993 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
7994 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7995 if (! img->background_valid) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7996 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7997 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
|
7998 if (!NILP (bg)) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
7999 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8000 img->background |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8001 = 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
|
8002 FRAME_BACKGROUND_PIXEL (f)); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8003 img->background_valid = 1; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8004 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8005 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8006 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8007 /* 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
|
8008 don't have the image yet. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8009 if (!EQ (*img->type->type, Qpostscript)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8010 postprocess_image (f, img); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8011 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8012 |
35288
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
8013 UNBLOCK_INPUT; |
912ea0b8e09b
(x_to_w32_color, x_set_icon_name, xlfd_strip_height)
Jason Rumney <jasonr@gnu.org>
parents:
34998
diff
changeset
|
8014 xassert (!interrupt_input_blocked); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8015 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8016 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8017 /* 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
|
8018 EMACS_GET_TIME (now); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8019 img->timestamp = EMACS_SECS (now); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8020 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8021 UNGCPRO; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8022 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8023 /* Value is the image id. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8024 return img->id; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8025 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8026 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8027 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8028 /* 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
|
8029 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8030 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8031 cache_image (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8032 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8033 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8034 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8035 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
|
8036 int i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8037 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8038 /* Find a free slot in c->images. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8039 for (i = 0; i < c->used; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8040 if (c->images[i] == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8041 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8042 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8043 /* 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
|
8044 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
|
8045 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8046 c->size *= 2; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8047 c->images = (struct image **) xrealloc (c->images, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8048 c->size * sizeof *c->images); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8049 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8050 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8051 /* 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
|
8052 c->images[i] = img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8053 img->id = i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8054 if (i == c->used) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8055 ++c->used; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8056 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8057 /* 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
|
8058 i = img->hash % IMAGE_CACHE_BUCKETS_SIZE; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8059 img->next = c->buckets[i]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8060 if (img->next) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8061 img->next->prev = img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8062 img->prev = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8063 c->buckets[i] = img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8064 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8065 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8066 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8067 /* 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
|
8068 Lisp Objects in the image cache. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8069 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8070 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8071 forall_images_in_image_cache (f, fn) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8072 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8073 void (*fn) P_ ((struct image *img)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8074 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8075 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
|
8076 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8077 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
|
8078 if (c) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8079 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8080 int i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8081 for (i = 0; i < c->used; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8082 if (c->images[i]) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8083 fn (c->images[i]); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8084 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8085 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8086 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8087 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8088 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8089 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8090 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8091 W32 support code |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8092 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8093 |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
8094 /* Macro for defining functions that will be loaded from image DLLs. */ |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
8095 #define DEF_IMGLIB_FN(func) FARPROC fn_##func |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
8096 |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
8097 /* Macro for loading those image functions from the library. */ |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
8098 #define LOAD_IMGLIB_FN(lib,func) { \ |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
8099 fn_##func = (void *) GetProcAddress (lib, #func); \ |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
8100 if (!fn_##func) return 0; \ |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
8101 } |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
8102 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8103 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
|
8104 XImage **, Pixmap *)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8105 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
|
8106 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8107 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8108 /* 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
|
8109 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
|
8110 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
|
8111 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
|
8112 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
|
8113 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
|
8114 successful. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8115 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8116 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8117 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
|
8118 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8119 int width, height, depth; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8120 XImage **ximg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8121 Pixmap *pixmap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8122 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8123 BITMAPINFOHEADER *header; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8124 HDC hdc; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8125 int scanline_width_bits; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8126 int remainder; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8127 int palette_colors = 0; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8128 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8129 if (depth == 0) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8130 depth = 24; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8131 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8132 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
|
8133 && 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
|
8134 { |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8135 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
|
8136 return 0; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8137 } |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8138 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8139 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
|
8140 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
|
8141 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8142 if (remainder) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8143 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
|
8144 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8145 /* 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
|
8146 /* 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
|
8147 if (depth < 16) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8148 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
|
8149 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8150 *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
|
8151 if (*ximg == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8152 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8153 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
|
8154 return 0; |
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 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8157 header = &((*ximg)->info.bmiHeader); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8158 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
|
8159 header->biSize = sizeof (*header); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8160 header->biWidth = width; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8161 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
|
8162 header->biPlanes = 1; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8163 header->biBitCount = depth; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8164 header->biCompression = BI_RGB; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8165 header->biClrUsed = palette_colors; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8166 |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8167 /* 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
|
8168 if (depth == 1) |
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
8169 { |
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
8170 (*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
|
8171 (*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
|
8172 (*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
|
8173 (*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
|
8174 (*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
|
8175 (*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
|
8176 (*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
|
8177 (*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
|
8178 } |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8179 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8180 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
|
8181 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8182 /* 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
|
8183 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
|
8184 *pixmap = CreateDIBSection (hdc, &((*ximg)->info), |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8185 (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
|
8186 &((*ximg)->data), NULL, 0); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8187 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8188 /* 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
|
8189 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
|
8190 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8191 if (*pixmap == NULL) |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8192 { |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8193 DWORD err = GetLastError(); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8194 Lisp_Object errcode; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8195 /* 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
|
8196 XSETINT (errcode, (int) err); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8197 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
|
8198 x_destroy_x_image (*ximg); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8199 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8200 } |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8201 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8202 return 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8203 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8204 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8205 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8206 /* Destroy XImage XIMG. Free XIMG->data. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8207 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8208 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8209 x_destroy_x_image (ximg) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8210 XImage *ximg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8211 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8212 xassert (interrupt_input_blocked); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8213 if (ximg) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8214 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8215 /* Data will be freed by DestroyObject. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8216 ximg->data = NULL; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8217 xfree (ximg); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8218 } |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8221 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8222 /* 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
|
8223 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
|
8224 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8225 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8226 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
|
8227 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8228 XImage *ximg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8229 Pixmap pixmap; |
49369
5518e109ec3b
2003-01-21 Jason Rumney <jasonr@gnu.org>
Jason Rumney <jasonr@gnu.org>
parents:
49079
diff
changeset
|
8230 int width, height; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8231 { |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8232 #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
|
8233 HDC hdc = get_frame_dc (f); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
8234 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
|
8235 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
|
8236 #endif |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
8237 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8238 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8239 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8240 /*********************************************************************** |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8241 File Handling |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8242 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8243 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8244 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
|
8245 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
|
8246 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8247 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8248 /* 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
|
8249 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
|
8250 nil if not found. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8251 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8252 static Lisp_Object |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8253 x_find_image_file (file) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8254 Lisp_Object file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8255 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8256 Lisp_Object file_found, search_path; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8257 struct gcpro gcpro1, gcpro2; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8258 int fd; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8259 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8260 file_found = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8261 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
|
8262 GCPRO2 (file_found, search_path); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8263 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8264 /* 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
|
8265 fd = openp (search_path, file, Qnil, &file_found, Qnil); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8266 |
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
|
8267 if (fd == -1) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8268 file_found = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8269 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8270 close (fd); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8271 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8272 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8273 return file_found; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8274 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8275 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8276 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8277 /* 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
|
8278 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
|
8279 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
|
8280 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8281 static char * |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8282 slurp_file (file, size) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8283 char *file; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8284 int *size; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8285 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8286 FILE *fp = NULL; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8287 char *buf = NULL; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8288 struct stat st; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8289 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8290 if (stat (file, &st) == 0 |
50164
61b178f7f6dc
(jpeg_load, png_load, slurp_file): Read image files
Jason Rumney <jasonr@gnu.org>
parents:
50099
diff
changeset
|
8291 && (fp = fopen (file, "rb")) != NULL |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8292 && (buf = (char *) xmalloc (st.st_size), |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8293 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
|
8294 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8295 *size = st.st_size; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8296 fclose (fp); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8297 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8298 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8299 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8300 if (fp) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8301 fclose (fp); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8302 if (buf) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8303 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8304 xfree (buf); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8305 buf = NULL; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8306 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8307 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8308 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8309 return buf; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8310 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8311 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8312 |
27397
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 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8315 XBM images |
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 |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8318 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
|
8319 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
|
8320 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
|
8321 char *, char *)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8322 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
|
8323 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
|
8324 unsigned char **)); |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8325 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
|
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 /* 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
|
8329 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8330 enum xbm_keyword_index |
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 XBM_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8333 XBM_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8334 XBM_WIDTH, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8335 XBM_HEIGHT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8336 XBM_DATA, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8337 XBM_FOREGROUND, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8338 XBM_BACKGROUND, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8339 XBM_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8340 XBM_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8341 XBM_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8342 XBM_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8343 XBM_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8344 XBM_MASK, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8345 XBM_LAST |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8346 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8347 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8348 /* 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
|
8349 of valid XBM image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8350 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8351 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
|
8352 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8353 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8354 {":file", IMAGE_STRING_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8355 {":width", IMAGE_POSITIVE_INTEGER_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8356 {":height", IMAGE_POSITIVE_INTEGER_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8357 {":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
|
8358 {":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
|
8359 {":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
|
8360 {":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
|
8361 {":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
|
8362 {":relief", IMAGE_INTEGER_VALUE, 0}, |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
8363 {":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
|
8364 {":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
|
8365 {":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
|
8366 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8367 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8368 /* Structure describing the image type XBM. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8369 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8370 static struct image_type xbm_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8371 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8372 &Qxbm, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8373 xbm_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8374 xbm_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8375 x_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8376 NULL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8377 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8378 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8379 /* Tokens returned from xbm_scan. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8380 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8381 enum xbm_token |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8382 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8383 XBM_TK_IDENT = 256, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8384 XBM_TK_NUMBER |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8385 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8386 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8387 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8388 /* 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
|
8389 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
|
8390 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
|
8391 entry `:type xbm.. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8392 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8393 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
|
8394 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
|
8395 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8396 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
|
8397 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
|
8398 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
|
8399 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8400 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
|
8401 have a size >= (WIDTH + 7) / 8 * HEIGHT |
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 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
|
8404 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8405 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
|
8406 bitmap. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8407 |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8408 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
|
8409 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
|
8410 XBM file. |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8411 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8412 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
|
8413 `: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
|
8414 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
|
8415 displayed is used. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8416 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8417 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8418 xbm_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8419 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8420 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8421 struct image_keyword kw[XBM_LAST]; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8422 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8423 bcopy (xbm_format, kw, sizeof kw); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8424 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
|
8425 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8426 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8427 xassert (EQ (kw[XBM_TYPE].value, Qxbm)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8428 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8429 if (kw[XBM_FILE].count) |
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 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
|
8432 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8433 } |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8434 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
|
8435 { |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8436 /* In-memory XBM file. */ |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8437 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
|
8438 return 0; |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8439 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8440 else |
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 Lisp_Object data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8443 int width, height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8444 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8445 /* 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
|
8446 if (!kw[XBM_WIDTH].count |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8447 || !kw[XBM_HEIGHT].count |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8448 || !kw[XBM_DATA].count) |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8451 data = kw[XBM_DATA].value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8452 width = XFASTINT (kw[XBM_WIDTH].value); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8453 height = XFASTINT (kw[XBM_HEIGHT].value); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8454 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8455 /* 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
|
8456 data. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8457 if (VECTORP (data)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8458 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8459 int i; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8460 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8461 /* 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
|
8462 if (XVECTOR (data)->size < height) |
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 /* 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
|
8466 for one line of the image. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8467 for (i = 0; i < height; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8468 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8469 Lisp_Object elt = XVECTOR (data)->contents[i]; |
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 if (STRINGP (elt)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8472 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
8473 if (SCHARS (elt) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8474 < (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
|
8475 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8476 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8477 else if (BOOL_VECTOR_P (elt)) |
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 if (XBOOL_VECTOR (elt)->size < width) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8480 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8481 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8482 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8483 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8484 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8485 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8486 else if (STRINGP (data)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8487 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
8488 if (SCHARS (data) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8489 < (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
|
8490 return 0; |
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 else if (BOOL_VECTOR_P (data)) |
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 (XBOOL_VECTOR (data)->size < width * height) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8495 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8496 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8497 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8498 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8499 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8500 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8501 return 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8502 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8503 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8504 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8505 /* 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
|
8506 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
|
8507 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
|
8508 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
|
8509 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
|
8510 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8511 static int |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8512 xbm_scan (s, end, sval, ival) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8513 char **s, *end; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8514 char *sval; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8515 int *ival; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8516 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8517 int c; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8518 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8519 loop: |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8520 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8521 /* Skip white space. */ |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8522 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
|
8523 ; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8524 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8525 if (*s >= end) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8526 c = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8527 else if (isdigit (c)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8528 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8529 int value = 0, digit; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8530 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8531 if (c == '0' && *s < end) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8532 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8533 c = *(*s)++; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8534 if (c == 'x' || c == 'X') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8535 { |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8536 while (*s < end) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8537 { |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8538 c = *(*s)++; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8539 if (isdigit (c)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8540 digit = c - '0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8541 else if (c >= 'a' && c <= 'f') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8542 digit = c - 'a' + 10; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8543 else if (c >= 'A' && c <= 'F') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8544 digit = c - 'A' + 10; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8545 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8546 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8547 value = 16 * value + digit; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8548 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8549 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8550 else if (isdigit (c)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8551 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8552 value = c - '0'; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8553 while (*s < end |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8554 && (c = *(*s)++, isdigit (c))) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8555 value = 8 * value + c - '0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8556 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8557 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8558 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8559 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8560 value = c - '0'; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8561 while (*s < end |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8562 && (c = *(*s)++, isdigit (c))) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8563 value = 10 * value + c - '0'; |
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 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8566 if (*s < end) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8567 *s = *s - 1; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8568 *ival = value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8569 c = XBM_TK_NUMBER; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8570 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8571 else if (isalpha (c) || c == '_') |
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 *sval++ = c; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8574 while (*s < end |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8575 && (c = *(*s)++, (isalnum (c) || c == '_'))) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8576 *sval++ = c; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8577 *sval = 0; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8578 if (*s < end) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8579 *s = *s - 1; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8580 c = XBM_TK_IDENT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8581 } |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8582 else if (c == '/' && **s == '*') |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8583 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8584 /* C-style comment. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8585 ++*s; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8586 while (**s && (**s != '*' || *(*s + 1) != '/')) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8587 ++*s; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8588 if (**s) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8589 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8590 *s += 2; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8591 goto loop; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8592 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8593 } |
27397
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 return c; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8598 |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8599 /* 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
|
8600 Windows does things. */ |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8601 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
|
8602 { |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8603 int i; |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8604 unsigned char reflected = 0x00; |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8605 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
|
8606 { |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8607 if (orig & (0x01 << i)) |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8608 reflected |= 0x80 >> i; |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8609 } |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8610 return reflected; |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8611 } |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8612 |
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8613 |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8614 /* 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
|
8615 static HBITMAP |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8616 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
|
8617 { |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8618 int i, j, w1, w2; |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8619 char *bits, *p; |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8620 HBITMAP bmp; |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8621 |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8622 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
|
8623 w2 = ((width + 15) / 16) * 2; /* nb of 16bits elt in W32 bitmap */ |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
8624 bits = (char *) alloca (height * w2); |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8625 bzero (bits, height * w2); |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8626 for (i = 0; i < height; i++) |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8627 { |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8628 p = bits + i*w2; |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8629 for (j = 0; j < w1; j++) |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8630 *p++ = reflect_byte(*data++); |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8631 } |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8632 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
|
8633 |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8634 return bmp; |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8635 } |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8636 |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8637 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8638 /* 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
|
8639 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
|
8640 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
|
8641 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
|
8642 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
|
8643 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
|
8644 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8645 static int |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8646 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
|
8647 char *contents, *end; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8648 int *width, *height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8649 unsigned char **data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8650 { |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8651 char *s = contents; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8652 char buffer[BUFSIZ]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8653 int padding_p = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8654 int v10 = 0; |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8655 int bytes_per_line, i, nbytes; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8656 unsigned char *p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8657 int value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8658 int LA1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8659 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8660 #define match() \ |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8661 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
|
8662 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8663 #define expect(TOKEN) \ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8664 if (LA1 != (TOKEN)) \ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8665 goto failure; \ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8666 else \ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8667 match () |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8668 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8669 #define expect_ident(IDENT) \ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8670 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
|
8671 match (); \ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8672 else \ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8673 goto failure |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8674 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8675 *width = *height = -1; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8676 if (data) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8677 *data = NULL; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8678 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
|
8679 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8680 /* 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
|
8681 while (LA1 == '#') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8682 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8683 match (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8684 expect_ident ("define"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8685 expect (XBM_TK_IDENT); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8686 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8687 if (LA1 == XBM_TK_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8688 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8689 char *p = strrchr (buffer, '_'); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8690 p = p ? p + 1 : buffer; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8691 if (strcmp (p, "width") == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8692 *width = value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8693 else if (strcmp (p, "height") == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8694 *height = value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8695 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8696 expect (XBM_TK_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8697 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8698 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8699 if (*width < 0 || *height < 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8700 goto failure; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8701 else if (data == NULL) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8702 goto success; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8703 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8704 /* Parse bits. Must start with `static'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8705 expect_ident ("static"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8706 if (LA1 == XBM_TK_IDENT) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8707 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8708 if (strcmp (buffer, "unsigned") == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8709 { |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8710 match (); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8711 expect_ident ("char"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8712 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8713 else if (strcmp (buffer, "short") == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8714 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8715 match (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8716 v10 = 1; |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8717 if (*width % 16 && *width % 16 < 9) |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8718 padding_p = 1; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8719 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8720 else if (strcmp (buffer, "char") == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8721 match (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8722 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8723 goto failure; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8724 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8725 else |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8726 goto failure; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8727 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8728 expect (XBM_TK_IDENT); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8729 expect ('['); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8730 expect (']'); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8731 expect ('='); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8732 expect ('{'); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8733 |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8734 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
|
8735 nbytes = bytes_per_line * *height; |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8736 p = *data = (char *) xmalloc (nbytes); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8737 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8738 if (v10) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8739 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8740 for (i = 0; i < nbytes; i += 2) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8741 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8742 int val = value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8743 expect (XBM_TK_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8744 |
48351
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
8745 *p++ = ~ val; |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8746 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
|
8747 *p++ = ~ (value >> 8); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8748 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8749 if (LA1 == ',' || LA1 == '}') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8750 match (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8751 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8752 goto failure; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8753 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8754 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8755 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8756 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8757 for (i = 0; i < nbytes; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8758 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8759 int val = value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8760 expect (XBM_TK_NUMBER); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8761 |
48351
6420af8e1ad8
(x_create_x_image_and_pixmap): Fill in palette for
Jason Rumney <jasonr@gnu.org>
parents:
48346
diff
changeset
|
8762 *p++ = ~ val; |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8763 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8764 if (LA1 == ',' || LA1 == '}') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8765 match (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8766 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8767 goto failure; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8768 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8769 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8770 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8771 success: |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8772 return 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8773 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8774 failure: |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8775 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8776 if (data && *data) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8777 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8778 xfree (*data); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8779 *data = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8780 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8781 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8782 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8783 #undef match |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8784 #undef expect |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8785 #undef expect_ident |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8786 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8787 |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8788 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
|
8789 struct frame *f; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8790 struct image *img; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8791 COLORREF foreground, background; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8792 { |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8793 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
|
8794 HGDIOBJ old_prev, new_prev; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8795 HBITMAP new_pixmap; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8796 |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8797 hdc = get_frame_dc (f); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8798 old_img_dc = CreateCompatibleDC (hdc); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8799 new_img_dc = CreateCompatibleDC (hdc); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8800 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
|
8801 release_frame_dc (f, hdc); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8802 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
|
8803 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
|
8804 SetTextColor (new_img_dc, foreground); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8805 SetBkColor (new_img_dc, background); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8806 |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8807 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
|
8808 0, 0, SRCCOPY); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8809 |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8810 SelectObject (old_img_dc, old_prev); |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
8811 SelectObject (new_img_dc, new_prev); |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8812 DeleteDC (old_img_dc); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8813 DeleteDC (new_img_dc); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8814 DeleteObject (img->pixmap); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8815 if (new_pixmap == 0) |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8816 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
|
8817 else |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8818 img->pixmap = new_pixmap; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8819 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8820 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8821 /* 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
|
8822 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
|
8823 successful. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8824 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8825 static int |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8826 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
|
8827 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8828 struct image *img; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8829 char *contents, *end; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8830 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8831 int rc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8832 unsigned char *data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8833 int success_p = 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8834 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8835 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
|
8836 if (rc) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8837 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8838 unsigned long foreground = FRAME_FOREGROUND_PIXEL (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8839 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
|
8840 int non_default_colors = 0; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8841 Lisp_Object value; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8842 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8843 xassert (img->width > 0 && img->height > 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8844 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8845 /* 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
|
8846 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
|
8847 if (!NILP (value)) |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8848 { |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8849 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
|
8850 non_default_colors = 1; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8851 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8852 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
|
8853 if (!NILP (value)) |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8854 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8855 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
|
8856 img->background = background; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8857 img->background_valid = 1; |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8858 non_default_colors = 1; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
8859 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8860 img->pixmap |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
8861 = 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
|
8862 |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8863 /* 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
|
8864 if (non_default_colors) |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8865 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
|
8866 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8867 xfree (data); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8868 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8869 if (img->pixmap == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8870 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8871 x_clear_image (f, img); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8872 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
|
8873 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8874 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8875 success_p = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8876 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8877 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8878 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
|
8879 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8880 return success_p; |
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 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8884 /* 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
|
8885 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8886 static int |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8887 xbm_file_p (data) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8888 Lisp_Object data; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8889 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8890 int w, h; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8891 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
|
8892 && 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
|
8893 (SDATA (data) |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
8894 + SBYTES (data)), |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8895 &w, &h, NULL)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8896 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8897 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
8898 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8899 /* 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
|
8900 non-zero if successful. */ |
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 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8903 xbm_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8904 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8905 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8906 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8907 int success_p = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8908 Lisp_Object file_name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8909 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8910 xassert (xbm_image_p (img->spec)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8911 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8912 /* 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
|
8913 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
|
8914 if (STRINGP (file_name)) |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8915 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8916 Lisp_Object file; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8917 char *contents; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8918 int size; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8919 struct gcpro gcpro1; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8920 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8921 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
|
8922 GCPRO1 (file); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8923 if (!STRINGP (file)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8924 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8925 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
|
8926 UNGCPRO; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8927 return 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8928 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8929 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
8930 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
|
8931 if (contents == NULL) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8932 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8933 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
|
8934 UNGCPRO; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8935 return 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8936 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8937 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8938 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
|
8939 UNGCPRO; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8940 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8941 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8942 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8943 struct image_keyword fmt[XBM_LAST]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8944 Lisp_Object data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8945 unsigned long foreground = FRAME_FOREGROUND_PIXEL (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8946 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
|
8947 int non_default_colors = 0; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8948 char *bits; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8949 int parsed_p; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8950 int in_memory_file_p = 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8951 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8952 /* 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
|
8953 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
|
8954 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
|
8955 |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8956 /* Parse the image specification. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8957 bcopy (xbm_format, fmt, sizeof fmt); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8958 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
|
8959 xassert (parsed_p); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8960 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8961 /* Get specified width, and height. */ |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8962 if (!in_memory_file_p) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8963 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8964 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
|
8965 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
|
8966 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
|
8967 } |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
8968 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8969 /* 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
|
8970 if (fmt[XBM_FOREGROUND].count |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8971 && STRINGP (fmt[XBM_FOREGROUND].value)) |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8972 { |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8973 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
|
8974 foreground); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8975 non_default_colors = 1; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8976 } |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8977 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8978 if (fmt[XBM_BACKGROUND].count |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8979 && STRINGP (fmt[XBM_BACKGROUND].value)) |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8980 { |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8981 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
|
8982 background); |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8983 non_default_colors = 1; |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
8984 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8985 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8986 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
|
8987 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
|
8988 (SDATA (data) |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
8989 + SBYTES (data))); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
8990 else |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8991 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8992 if (VECTORP (data)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8993 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8994 int i; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8995 char *p; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8996 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
|
8997 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
8998 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
|
8999 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
|
9000 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9001 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
|
9002 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
|
9003 bcopy (SDATA (line), p, nbytes); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9004 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9005 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
|
9006 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9007 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9008 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
|
9009 bits = SDATA (data); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9010 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9011 bits = XBOOL_VECTOR (data)->data; |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9012 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9013 /* Create the pixmap. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9014 img->pixmap |
45343
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9015 = 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
|
9016 bits); |
0c8e1c895076
(w32_create_pixmap_from_bitmap_data): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45232
diff
changeset
|
9017 |
48483
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
9018 /* 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
|
9019 if (non_default_colors) |
cf6379011f93
(convert_mono_to_color_image): New function.
Jason Rumney <jasonr@gnu.org>
parents:
48449
diff
changeset
|
9020 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
|
9021 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9022 if (img->pixmap) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9023 success_p = 1; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9024 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9025 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9026 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
|
9027 img->spec, Qnil); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9028 x_clear_image (f, img); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9029 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9030 } |
27397
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 return success_p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9034 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9035 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9036 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9037 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9038 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9039 XPM images |
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 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9042 #if HAVE_XPM |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9043 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9044 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
|
9045 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
|
9046 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
|
9047 |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9048 /* Indicate to xpm.h that we don't have Xlib. */ |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9049 #define FOR_MSW |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9050 /* simx.h in xpm defines XColor and XImage differently than Emacs. */ |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9051 #define XColor xpm_XColor |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9052 #define XImage xpm_XImage |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9053 #define PIXEL_ALREADY_TYPEDEFED |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9054 #include "X11/xpm.h" |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9055 #undef FOR_MSW |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9056 #undef XColor |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9057 #undef XImage |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9058 #undef PIXEL_ALREADY_TYPEDEFED |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9059 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9060 /* The symbol `xpm' identifying XPM-format images. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9061 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9062 Lisp_Object Qxpm; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9063 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9064 /* 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
|
9065 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9066 enum xpm_keyword_index |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9067 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9068 XPM_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9069 XPM_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9070 XPM_DATA, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9071 XPM_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9072 XPM_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9073 XPM_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9074 XPM_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9075 XPM_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9076 XPM_MASK, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9077 XPM_COLOR_SYMBOLS, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9078 XPM_BACKGROUND, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9079 XPM_LAST |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9080 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9081 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9082 /* 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
|
9083 of valid XPM image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9084 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9085 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
|
9086 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9087 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9088 {":file", IMAGE_STRING_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9089 {":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
|
9090 {":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
|
9091 {":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
|
9092 {":relief", IMAGE_INTEGER_VALUE, 0}, |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
9093 {":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
|
9094 {":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
|
9095 {":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
|
9096 {":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
|
9097 {":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
|
9098 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9099 |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9100 /* Structure describing the image type XPM. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9101 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9102 static struct image_type xpm_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9103 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9104 &Qxpm, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9105 xpm_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9106 xpm_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9107 x_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9108 NULL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9109 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9110 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9111 |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9112 /* XPM library details. */ |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9113 |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9114 DEF_IMGLIB_FN (XpmFreeAttributes); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9115 DEF_IMGLIB_FN (XpmCreateImageFromBuffer); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9116 DEF_IMGLIB_FN (XpmReadFileToImage); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9117 DEF_IMGLIB_FN (XImageFree); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9118 |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9119 |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9120 static int |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9121 init_xpm_functions (library) |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9122 HMODULE library; |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9123 { |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9124 LOAD_IMGLIB_FN (library, XpmFreeAttributes); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9125 LOAD_IMGLIB_FN (library, XpmCreateImageFromBuffer); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9126 LOAD_IMGLIB_FN (library, XpmReadFileToImage); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9127 LOAD_IMGLIB_FN (library, XImageFree); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9128 |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9129 return 1; |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9130 } |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9131 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9132 /* 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
|
9133 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
|
9134 cdr are strings. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9135 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9136 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9137 xpm_valid_color_symbols_p (color_symbols) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9138 Lisp_Object color_symbols; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9139 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9140 while (CONSP (color_symbols)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9141 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9142 Lisp_Object sym = XCAR (color_symbols); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9143 if (!CONSP (sym) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9144 || !STRINGP (XCAR (sym)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9145 || !STRINGP (XCDR (sym))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9146 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9147 color_symbols = XCDR (color_symbols); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9148 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9149 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9150 return NILP (color_symbols); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9151 } |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9154 /* 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
|
9155 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9156 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9157 xpm_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9158 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9159 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9160 struct image_keyword fmt[XPM_LAST]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9161 bcopy (xpm_format, fmt, sizeof fmt); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9162 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
|
9163 /* Either `:file' or `:data' must be present. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9164 && 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
|
9165 /* 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
|
9166 whose car and cdr are strings. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9167 && (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
|
9168 || 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
|
9169 } |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9172 /* 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
|
9173 non-zero if successful. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9174 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9175 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9176 xpm_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9177 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9178 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9179 { |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9180 HDC hdc; |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9181 int rc; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9182 XpmAttributes attrs; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9183 Lisp_Object specified_file, color_symbols; |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9184 xpm_XImage * xpm_image, * xpm_mask; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9185 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9186 /* 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
|
9187 close colors. Return colors allocated. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9188 bzero (&attrs, sizeof attrs); |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9189 xpm_image = xpm_mask = NULL; |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9190 |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9191 #if 0 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
9192 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
|
9193 attrs.colormap = FRAME_X_COLORMAP (f); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9194 attrs.valuemask |= XpmVisual; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
9195 attrs.valuemask |= XpmColormap; |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9196 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9197 attrs.valuemask |= XpmReturnAllocPixels; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
9198 #ifdef XpmAllocCloseColors |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9199 attrs.alloc_close_colors = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9200 attrs.valuemask |= XpmAllocCloseColors; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
9201 #else |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
9202 attrs.closeness = 600; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
9203 attrs.valuemask |= XpmCloseness; |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
9204 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9205 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9206 /* 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
|
9207 these to `attrs'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9208 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
|
9209 if (CONSP (color_symbols)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9210 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9211 Lisp_Object tail; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9212 XpmColorSymbol *xpm_syms; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9213 int i, size; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9214 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9215 attrs.valuemask |= XpmColorSymbols; |
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 /* Count number of symbols. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9218 attrs.numsymbols = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9219 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
|
9220 ++attrs.numsymbols; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9221 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9222 /* Allocate an XpmColorSymbol array. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9223 size = attrs.numsymbols * sizeof *xpm_syms; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9224 xpm_syms = (XpmColorSymbol *) alloca (size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9225 bzero (xpm_syms, size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9226 attrs.colorsymbols = xpm_syms; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9227 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9228 /* Fill the color symbol array. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9229 for (tail = color_symbols, i = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9230 CONSP (tail); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9231 ++i, tail = XCDR (tail)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9232 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9233 Lisp_Object name = XCAR (XCAR (tail)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9234 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
|
9235 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
|
9236 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
|
9237 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
|
9238 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
|
9239 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9240 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9241 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9242 /* 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
|
9243 string buffer containing data in the same format as an XPM file. */ |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9244 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9245 specified_file = image_spec_value (img->spec, QCfile, NULL); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49562
diff
changeset
|
9246 |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9247 { |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9248 HDC frame_dc = get_frame_dc (f); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9249 hdc = CreateCompatibleDC (frame_dc); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9250 release_frame_dc (f, frame_dc); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9251 } |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9252 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9253 if (STRINGP (specified_file)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9254 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9255 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
|
9256 if (!STRINGP (file)) |
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 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
|
9259 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9260 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9261 |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9262 /* XpmReadFileToPixmap is not available in the Windows port of |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9263 libxpm. But XpmReadFileToImage almost does what we want. */ |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9264 rc = fn_XpmReadFileToImage (&hdc, SDATA (file), |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9265 &xpm_image, &xpm_mask, |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9266 &attrs); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9267 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9268 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9269 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9270 Lisp_Object buffer = image_spec_value (img->spec, QCdata, NULL); |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9271 /* XpmCreatePixmapFromBuffer is not available in the Windows port |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9272 of libxpm. But XpmCreateImageFromBuffer almost does what we want. */ |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9273 rc = fn_XpmCreateImageFromBuffer (&hdc, SDATA (buffer), |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9274 &xpm_image, &xpm_mask, |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9275 &attrs); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9276 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9277 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9278 if (rc == XpmSuccess) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9279 { |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9280 int i; |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9281 |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9282 /* W32 XPM uses XImage to wrap what W32 Emacs calls a Pixmap, |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9283 plus some duplicate attributes. */ |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9284 if (xpm_image && xpm_image->bitmap) |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9285 { |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9286 img->pixmap = xpm_image->bitmap; |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9287 /* XImageFree in libXpm frees XImage struct without destroying |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9288 the bitmap, which is what we want. */ |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9289 fn_XImageFree (xpm_image); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9290 } |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9291 if (xpm_mask && xpm_mask->bitmap) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49562
diff
changeset
|
9292 { |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9293 /* The mask appears to be inverted compared with what we expect. |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9294 TODO: invert our expectations. See other places where we |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9295 have to invert bits because our idea of masks is backwards. */ |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9296 HGDIOBJ old_obj; |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9297 old_obj = SelectObject (hdc, xpm_mask->bitmap); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9298 |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9299 PatBlt (hdc, 0, 0, xpm_mask->width, xpm_mask->height, DSTINVERT); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9300 SelectObject (hdc, old_obj); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9301 |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9302 img->mask = xpm_mask->bitmap; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49562
diff
changeset
|
9303 fn_XImageFree (xpm_mask); |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9304 DeleteDC (hdc); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9305 } |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9306 |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9307 DeleteDC (hdc); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9308 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9309 /* Remember allocated colors. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9310 img->ncolors = attrs.nalloc_pixels; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9311 img->colors = (unsigned long *) xmalloc (img->ncolors |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9312 * sizeof *img->colors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9313 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
|
9314 img->colors[i] = attrs.alloc_pixels[i]; |
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 img->width = attrs.width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9317 img->height = attrs.height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9318 xassert (img->width > 0 && img->height > 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9319 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9320 /* The call to XpmFreeAttributes below frees attrs.alloc_pixels. */ |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9321 fn_XpmFreeAttributes (&attrs); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9322 } |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9323 else |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9324 { |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9325 DeleteDC (hdc); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
9326 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9327 switch (rc) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9328 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9329 case XpmOpenFailed: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9330 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
|
9331 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9332 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9333 case XpmFileInvalid: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9334 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
|
9335 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9336 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9337 case XpmNoMemory: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9338 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
|
9339 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9340 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9341 case XpmColorFailed: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9342 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
|
9343 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9344 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9345 default: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9346 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
|
9347 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9348 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9349 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9350 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9351 return rc == XpmSuccess; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9352 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9353 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9354 #endif /* HAVE_XPM != 0 */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9355 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9356 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
9357 #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
|
9358 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9359 Color table |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9360 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9361 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9362 /* 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
|
9363 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9364 struct ct_color |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9365 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9366 int r, g, b; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9367 unsigned long pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9368 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9369 /* Next in color table collision list. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9370 struct ct_color *next; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9371 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9372 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9373 /* 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
|
9374 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9375 #define CT_SIZE 101 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9376 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9377 /* 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
|
9378 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9379 #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
|
9380 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9381 /* The color hash table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9382 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9383 struct ct_color **ct_table; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9384 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9385 /* Number of entries in the color table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9386 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9387 int ct_colors_allocated; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9388 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9389 /* Function prototypes. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9390 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9391 static void init_color_table P_ ((void)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9392 static void free_color_table P_ ((void)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9393 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
|
9394 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
|
9395 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
|
9396 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9397 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9398 /* Initialize the color table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9399 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9400 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9401 init_color_table () |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9402 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9403 int size = CT_SIZE * sizeof (*ct_table); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9404 ct_table = (struct ct_color **) xmalloc (size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9405 bzero (ct_table, size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9406 ct_colors_allocated = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9407 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9408 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9409 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9410 /* Free memory associated with the color table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9411 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9412 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9413 free_color_table () |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9414 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9415 int i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9416 struct ct_color *p, *next; |
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 for (i = 0; i < CT_SIZE; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9419 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
|
9420 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9421 next = p->next; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9422 xfree (p); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9423 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9424 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9425 xfree (ct_table); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9426 ct_table = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9427 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9428 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9429 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9430 /* 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
|
9431 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
|
9432 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
|
9433 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
|
9434 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9435 static unsigned long |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9436 lookup_rgb_color (f, r, g, b) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9437 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9438 int r, g, b; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9439 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9440 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
|
9441 int i = hash % CT_SIZE; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9442 struct ct_color *p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9443 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9444 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
|
9445 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
|
9446 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9447 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9448 if (p == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9449 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9450 COLORREF color; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9451 Colormap cmap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9452 int rc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9453 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9454 color = PALETTERGB (r, g, b); |
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 ++ct_colors_allocated; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9457 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9458 p = (struct ct_color *) xmalloc (sizeof *p); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9459 p->r = r; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9460 p->g = g; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9461 p->b = b; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9462 p->pixel = color; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9463 p->next = ct_table[i]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9464 ct_table[i] = p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9465 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9466 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9467 return p->pixel; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9470 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9471 /* 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
|
9472 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
|
9473 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9474 static unsigned long |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9475 lookup_pixel_color (f, pixel) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9476 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9477 unsigned long pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9478 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9479 int i = pixel % CT_SIZE; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9480 struct ct_color *p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9481 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9482 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
|
9483 if (p->pixel == pixel) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9484 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9485 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9486 if (p == NULL) |
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 XColor color; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9489 Colormap cmap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9490 int rc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9491 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9492 BLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9493 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9494 cmap = DefaultColormapOfScreen (FRAME_X_SCREEN (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9495 color.pixel = pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9496 XQueryColor (NULL, cmap, &color); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9497 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
|
9498 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9499 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9500 if (rc) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9501 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9502 ++ct_colors_allocated; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9503 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9504 p = (struct ct_color *) xmalloc (sizeof *p); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9505 p->r = color.red; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9506 p->g = color.green; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9507 p->b = color.blue; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9508 p->pixel = pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9509 p->next = ct_table[i]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9510 ct_table[i] = p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9511 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9512 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9513 return FRAME_FOREGROUND_PIXEL (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9514 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9515 return p->pixel; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9516 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9517 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9518 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9519 /* 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
|
9520 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
|
9521 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9522 static unsigned long * |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9523 colors_in_color_table (n) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9524 int *n; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9525 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9526 int i, j; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9527 struct ct_color *p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9528 unsigned long *colors; |
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 if (ct_colors_allocated == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9531 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9532 *n = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9533 colors = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9534 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9535 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9536 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9537 colors = (unsigned long *) xmalloc (ct_colors_allocated |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9538 * sizeof *colors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9539 *n = ct_colors_allocated; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9540 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9541 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
|
9542 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
|
9543 colors[j++] = p->pixel; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9546 return colors; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9547 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9548 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
9549 #endif /* TODO */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9550 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9551 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9552 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9553 Algorithms |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9554 ***********************************************************************/ |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9555 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
|
9556 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
|
9557 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
|
9558 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
|
9559 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9560 /* 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
|
9561 disabled'. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9562 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9563 int cross_disabled_images; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9564 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9565 /* 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
|
9566 strategies. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9567 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9568 static int emboss_matrix[9] = { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9569 /* x - 1 x x + 1 */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9570 2, -1, 0, /* y - 1 */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9571 -1, 0, 1, /* y */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9572 0, 1, -2 /* y + 1 */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9573 }; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9574 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9575 static int laplace_matrix[9] = { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9576 /* x - 1 x x + 1 */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9577 1, 0, 0, /* y - 1 */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9578 0, 0, 0, /* y */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9579 0, 0, -1 /* y + 1 */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9580 }; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9581 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9582 /* 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
|
9583 are R, G, and B. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9584 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9585 #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
|
9586 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9587 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9588 /* 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
|
9589 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
|
9590 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
|
9591 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
|
9592 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
|
9593 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9594 static XColor * |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9595 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
|
9596 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9597 struct image *img; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9598 int rgb_p; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9599 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9600 int x, y; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9601 XColor *colors, *p; |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9602 HDC hdc, bmpdc; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9603 HGDIOBJ prev; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9604 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9605 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
|
9606 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9607 /* 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
|
9608 hdc = get_frame_dc (f); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9609 bmpdc = CreateCompatibleDC (hdc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9610 release_frame_dc (f, hdc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9611 prev = SelectObject (bmpdc, img->pixmap); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9612 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9613 /* 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
|
9614 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
|
9615 p = colors; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9616 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
|
9617 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9618 XColor *row = p; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9619 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9620 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
|
9621 { |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9622 /* TODO: palette support needed here? */ |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9623 p->pixel = GetPixel (bmpdc, x, y); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9624 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9625 if (rgb_p) |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9626 { |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9627 p->red = 256 * GetRValue (p->pixel); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9628 p->green = 256 * GetGValue (p->pixel); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9629 p->blue = 256 * GetBValue (p->pixel); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9630 } |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9631 } |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9632 } |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9633 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9634 SelectObject (bmpdc, prev); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9635 DeleteDC (bmpdc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9636 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9637 return colors; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9638 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9639 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9640 /* 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
|
9641 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
|
9642 stored in ximg->data. */ |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9643 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9644 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
|
9645 XImage * ximg; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9646 int x, y; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9647 COLORREF color; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9648 { |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9649 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
|
9650 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
|
9651 unsigned char * pixel; |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9652 |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9653 /* True color images. */ |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9654 if (ximg->info.bmiHeader.biBitCount == 24) |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9655 { |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9656 int rowbytes = width * 3; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9657 /* Ensure scanlines are aligned on 4 byte boundaries. */ |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9658 if (rowbytes % 4) |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9659 rowbytes += 4 - (rowbytes % 4); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9660 |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9661 pixel = ximg->data + y * rowbytes + x * 3; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9662 /* Windows bitmaps are in BGR order. */ |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9663 *pixel = GetBValue (color); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9664 *(pixel + 1) = GetGValue (color); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9665 *(pixel + 2) = GetRValue (color); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9666 } |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9667 /* Monochrome images. */ |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9668 else if (ximg->info.bmiHeader.biBitCount == 1) |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9669 { |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9670 int rowbytes = width / 8; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9671 /* Ensure scanlines are aligned on 4 byte boundaries. */ |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9672 if (rowbytes % 4) |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9673 rowbytes += 4 - (rowbytes % 4); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9674 pixel = ximg->data + y * rowbytes + x / 8; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9675 /* Filter out palette info. */ |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9676 if (color & 0x00ffffff) |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9677 *pixel = *pixel | (1 << x % 8); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9678 else |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9679 *pixel = *pixel & ~(1 << x % 8); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9680 } |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9681 else |
53072
8787289602d1
Remove period at end of error message.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52737
diff
changeset
|
9682 image_error ("XPutPixel: palette image not supported", Qnil, Qnil); |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
9683 } |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9684 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9685 /* 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
|
9686 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
|
9687 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
|
9688 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9689 static void |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9690 x_from_xcolors (f, img, colors) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9691 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9692 struct image *img; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9693 XColor *colors; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9694 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9695 int x, y; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9696 XImage *oimg; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9697 Pixmap pixmap; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9698 XColor *p; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9699 #if 0 /* TODO: color tables. */ |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9700 init_color_table (); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9701 #endif |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9702 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
|
9703 &oimg, &pixmap); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9704 p = colors; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9705 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
|
9706 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
|
9707 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9708 unsigned long pixel; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9709 #if 0 /* TODO: color tables. */ |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9710 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
|
9711 #else |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9712 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
|
9713 #endif |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9714 XPutPixel (oimg, x, y, pixel); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9715 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9716 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9717 xfree (colors); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9718 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
|
9719 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9720 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
|
9721 x_destroy_x_image (oimg); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9722 img->pixmap = pixmap; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9723 #if 0 /* TODO: color tables. */ |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9724 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
|
9725 free_color_table (); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9726 #endif |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9727 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9728 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9729 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9730 /* 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
|
9731 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9732 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
|
9733 matrix. See emboss_matrix for an example. |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9734 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9735 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
|
9736 outgoing image. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9737 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9738 static void |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9739 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
|
9740 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9741 struct image *img; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9742 int matrix[9], color_adjust; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9743 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9744 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
|
9745 XColor *new, *p; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9746 int x, y, i, sum; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9747 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9748 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
|
9749 sum += abs (matrix[i]); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9750 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9751 #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
|
9752 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9753 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
|
9754 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9755 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
|
9756 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9757 p = COLOR (new, 0, y); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9758 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
|
9759 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
|
9760 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
|
9761 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9762 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9763 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
|
9764 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9765 p = COLOR (new, x, 0); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9766 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
|
9767 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
|
9768 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
|
9769 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9770 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9771 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
|
9772 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9773 p = COLOR (new, 1, y); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9774 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9775 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
|
9776 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9777 int r, g, b, y1, x1; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9778 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9779 r = g = b = i = 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9780 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
|
9781 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
|
9782 if (matrix[i]) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9783 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9784 XColor *t = COLOR (colors, x1, y1); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9785 r += matrix[i] * t->red; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9786 g += matrix[i] * t->green; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9787 b += matrix[i] * t->blue; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9788 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9789 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9790 r = (r / sum + color_adjust) & 0xffff; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9791 g = (g / sum + color_adjust) & 0xffff; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9792 b = (b / sum + color_adjust) & 0xffff; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9793 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
|
9794 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9795 } |
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 xfree (colors); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9798 x_from_xcolors (f, img, new); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9799 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9800 #undef COLOR |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9801 } |
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 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9804 /* 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
|
9805 on frame F. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9806 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9807 static void |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9808 x_emboss (f, img) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9809 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9810 struct image *img; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9811 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9812 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
|
9813 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9814 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9815 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9816 /* 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
|
9817 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
|
9818 to draw disabled buttons, for example. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9819 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9820 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9821 x_laplace (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9822 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9823 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9824 { |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9825 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
|
9826 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9827 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9828 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9829 /* 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
|
9830 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
|
9831 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9832 MATRIX must be either |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9833 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9834 - 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
|
9835 - 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
|
9836 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9837 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
|
9838 number. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9839 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9840 static void |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9841 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
|
9842 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9843 struct image *img; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9844 Lisp_Object matrix, color_adjust; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9845 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9846 int i = 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9847 int trans[9]; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9848 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9849 if (CONSP (matrix)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9850 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9851 for (i = 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9852 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
|
9853 ++i, matrix = XCDR (matrix)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9854 trans[i] = XFLOATINT (XCAR (matrix)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9855 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9856 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
|
9857 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9858 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
|
9859 trans[i] = XFLOATINT (AREF (matrix, i)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9860 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9861 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9862 if (NILP (color_adjust)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9863 color_adjust = make_number (0xffff / 2); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9864 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9865 if (i == 9 && NUMBERP (color_adjust)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9866 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
|
9867 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9868 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9869 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9870 /* 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
|
9871 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9872 static void |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9873 x_disable_image (f, img) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9874 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9875 struct image *img; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9876 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9877 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
|
9878 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9879 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
|
9880 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9881 /* 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
|
9882 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
|
9883 we're using this method instead. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9884 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
|
9885 XColor *p, *end; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9886 const int h = 15000; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9887 const int l = 30000; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9888 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9889 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
|
9890 p < end; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9891 ++p) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9892 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9893 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
|
9894 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
|
9895 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
|
9896 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9897 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9898 x_from_xcolors (f, img, colors); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9899 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9900 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9901 /* 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
|
9902 should. */ |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
9903 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
|
9904 { |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9905 HDC hdc, bmpdc; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9906 HGDIOBJ prev; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9907 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9908 hdc = get_frame_dc (f); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9909 bmpdc = CreateCompatibleDC (hdc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9910 release_frame_dc (f, hdc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9911 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9912 prev = SelectObject (bmpdc, img->pixmap); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9913 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9914 SetTextColor (bmpdc, BLACK_PIX_DEFAULT (f)); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9915 MoveToEx (bmpdc, 0, 0, NULL); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9916 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
|
9917 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
|
9918 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
|
9919 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9920 if (img->mask) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9921 { |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9922 SelectObject (bmpdc, img->mask); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9923 SetTextColor (bmpdc, WHITE_PIX_DEFAULT (f)); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9924 MoveToEx (bmpdc, 0, 0, NULL); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9925 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
|
9926 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
|
9927 LineTo (bmpdc, img->width - 1, 0); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9928 } |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9929 SelectObject (bmpdc, prev); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9930 DeleteDC (bmpdc); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
9931 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9932 } |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9935 /* 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
|
9936 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
|
9937 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
|
9938 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
|
9939 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
|
9940 heuristically. Value is non-zero if successful. */ |
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 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9943 x_build_heuristic_mask (f, img, how) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9944 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9945 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9946 Lisp_Object how; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9947 { |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9948 HDC img_dc, frame_dc; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9949 HGDIOBJ prev; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9950 char *mask_img; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9951 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
|
9952 unsigned long bg = 0; |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9953 int row_width; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9954 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9955 if (img->mask) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9956 { |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9957 DeleteObject (img->mask); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9958 img->mask = NULL; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9959 img->background_transparent_valid = 0; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9960 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9961 |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9962 /* 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
|
9963 row_width = (img->width + 7) / 8; |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9964 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
|
9965 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
|
9966 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9967 /* 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
|
9968 frame_dc = get_frame_dc (f); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9969 img_dc = CreateCompatibleDC (frame_dc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9970 release_frame_dc (f, frame_dc); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9971 prev = SelectObject (img_dc, img->pixmap); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9972 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9973 /* 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
|
9974 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
|
9975 use_img_background = 1; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9976 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9977 if (CONSP (how)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9978 { |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9979 int rgb[3], i; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9980 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9981 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
|
9982 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9983 rgb[i] = XFASTINT (XCAR (how)) & 0xffff; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9984 how = XCDR (how); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9985 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9986 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9987 if (i == 3 && NILP (how)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9988 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9989 char color_name[30]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
9990 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
|
9991 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
|
9992 & 0x00ffffff; /* Filter out palette info. */ |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9993 use_img_background = 0; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9994 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9995 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
9996 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
9997 if (use_img_background) |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
9998 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
|
9999 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10000 /* 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
|
10001 from the background color bg. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10002 for (y = 0; y < img->height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10003 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
|
10004 { |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10005 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
|
10006 if (p != bg) |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10007 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
|
10008 } |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10009 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10010 /* Create the mask image. */ |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10011 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
|
10012 mask_img); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10013 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10014 /* 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
|
10015 SelectObject (img_dc, img->mask); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10016 |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10017 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
|
10018 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10019 /* Put mask_img into img->mask. */ |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10020 x_destroy_x_image ((XImage *)mask_img); |
48346
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10021 SelectObject (img_dc, prev); |
140fd0332d31
(w32_defined_color): Adjust RGB values for Emacs.
Jason Rumney <jasonr@gnu.org>
parents:
47983
diff
changeset
|
10022 DeleteDC (img_dc); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10023 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10024 return 1; |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10025 } |
44123
f23c96125044
(xbm_scan, xbm_load_image, xbm_read_bitmap_data)
Jason Rumney <jasonr@gnu.org>
parents:
44109
diff
changeset
|
10026 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10027 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10028 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10029 PBM (mono, gray, color) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10030 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10031 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10032 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
|
10033 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
|
10034 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
|
10035 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10036 /* 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
|
10037 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10038 Lisp_Object Qpbm; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10039 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10040 /* 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
|
10041 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10042 enum pbm_keyword_index |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10043 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10044 PBM_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10045 PBM_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10046 PBM_DATA, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10047 PBM_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10048 PBM_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10049 PBM_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10050 PBM_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10051 PBM_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10052 PBM_MASK, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10053 PBM_FOREGROUND, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10054 PBM_BACKGROUND, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10055 PBM_LAST |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10056 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10057 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10058 /* 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
|
10059 of valid user-defined image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10060 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10061 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
|
10062 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10063 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10064 {":file", IMAGE_STRING_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10065 {":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
|
10066 {":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
|
10067 {":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
|
10068 {":relief", IMAGE_INTEGER_VALUE, 0}, |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
10069 {":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
|
10070 {":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
|
10071 {":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
|
10072 {":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
|
10073 {":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
|
10074 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10075 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10076 /* Structure describing the image type `pbm'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10077 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10078 static struct image_type pbm_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10079 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10080 &Qpbm, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10081 pbm_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10082 pbm_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10083 x_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10084 NULL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10085 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10086 |
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 /* 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
|
10089 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10090 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10091 pbm_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10092 Lisp_Object object; |
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 struct image_keyword fmt[PBM_LAST]; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10095 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10096 bcopy (pbm_format, fmt, sizeof fmt); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10097 |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
10098 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
|
10099 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10100 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10101 /* Must specify either :data or :file. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10102 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
|
10103 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10104 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10105 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10106 /* 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
|
10107 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
|
10108 end of input. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10109 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10110 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10111 pbm_scan_number (s, end) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10112 unsigned char **s, *end; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10113 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10114 int c, val = -1; |
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 while (*s < end) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10117 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10118 /* Skip white-space. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10119 while (*s < end && (c = *(*s)++, isspace (c))) |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10122 if (c == '#') |
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 /* Skip comment to end of line. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10125 while (*s < end && (c = *(*s)++, c != '\n')) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10126 ; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10127 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10128 else if (isdigit (c)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10129 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10130 /* Read decimal number. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10131 val = c - '0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10132 while (*s < end && (c = *(*s)++, isdigit (c))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10133 val = 10 * val + c - '0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10134 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10135 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10136 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10137 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10138 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10139 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10140 return val; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10141 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10142 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10143 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10144 /* 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
|
10145 with xmalloc holding FILE's contents. Value is null if an error |
46272 | 10146 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
|
10147 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10148 static char * |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10149 pbm_read_file (file, size) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10150 Lisp_Object file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10151 int *size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10152 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10153 FILE *fp = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10154 char *buf = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10155 struct stat st; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10156 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10157 if (stat (SDATA (file), &st) == 0 |
50164
61b178f7f6dc
(jpeg_load, png_load, slurp_file): Read image files
Jason Rumney <jasonr@gnu.org>
parents:
50099
diff
changeset
|
10158 && (fp = fopen (SDATA (file), "rb")) != NULL |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10159 && (buf = (char *) xmalloc (st.st_size), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10160 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
|
10161 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10162 *size = st.st_size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10163 fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10164 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10165 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10166 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10167 if (fp) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10168 fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10169 if (buf) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10170 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10171 xfree (buf); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10172 buf = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10173 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10174 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10175 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10176 return buf; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10177 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10178 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10179 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10180 /* 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
|
10181 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10182 static int |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10183 pbm_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10184 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10185 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10186 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10187 int raw_p, x, y; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10188 int width, height, max_color_idx = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10189 XImage *ximg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10190 Lisp_Object file, specified_file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10191 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
|
10192 struct gcpro gcpro1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10193 unsigned char *contents = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10194 unsigned char *end, *p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10195 int size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10196 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10197 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
|
10198 file = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10199 GCPRO1 (file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10200 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10201 if (STRINGP (specified_file)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10202 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10203 file = x_find_image_file (specified_file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10204 if (!STRINGP (file)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10205 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10206 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
|
10207 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10208 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10209 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10210 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10211 contents = slurp_file (SDATA (file), &size); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10212 if (contents == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10213 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10214 image_error ("Error reading `%s'", file, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10215 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10216 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10217 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10218 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10219 p = contents; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10220 end = contents + size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10221 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10222 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10223 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10224 Lisp_Object data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10225 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
|
10226 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
|
10227 end = p + SBYTES (data); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10228 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10229 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10230 /* Check magic number. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10231 if (end - p < 2 || *p++ != 'P') |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10232 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10233 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
|
10234 error: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10235 xfree (contents); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10236 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10237 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10238 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10239 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10240 switch (*p++) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10241 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10242 case '1': |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10243 raw_p = 0, type = PBM_MONO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10244 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10245 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10246 case '2': |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10247 raw_p = 0, type = PBM_GRAY; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10248 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10249 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10250 case '3': |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10251 raw_p = 0, type = PBM_COLOR; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10252 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10253 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10254 case '4': |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10255 raw_p = 1, type = PBM_MONO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10256 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10257 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10258 case '5': |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10259 raw_p = 1, type = PBM_GRAY; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10260 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10261 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10262 case '6': |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10263 raw_p = 1, type = PBM_COLOR; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10264 break; |
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 default: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10267 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
|
10268 goto error; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10271 /* Read width, height, maximum color-component. Characters |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10272 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
|
10273 width = pbm_scan_number (&p, end); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10274 height = pbm_scan_number (&p, end); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10275 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10276 if (type != PBM_MONO) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10277 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10278 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
|
10279 if (raw_p && max_color_idx > 255) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10280 max_color_idx = 255; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10281 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10282 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10283 if (width < 0 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10284 || height < 0 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10285 || (type != PBM_MONO && max_color_idx < 0)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10286 goto error; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10287 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10288 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
|
10289 goto error; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10290 |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10291 #if 0 /* TODO: color tables. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10292 /* Initialize the color hash table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10293 init_color_table (); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10294 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10295 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10296 if (type == PBM_MONO) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10297 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10298 int c = 0, g; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10299 struct image_keyword fmt[PBM_LAST]; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10300 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
|
10301 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
|
10302 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10303 /* Parse the image specification. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10304 bcopy (pbm_format, fmt, sizeof fmt); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10305 parse_image_spec (img->spec, fmt, PBM_LAST, Qpbm); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10306 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10307 /* 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
|
10308 if (fmt[PBM_FOREGROUND].count |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10309 && STRINGP (fmt[PBM_FOREGROUND].value)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10310 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
|
10311 if (fmt[PBM_BACKGROUND].count |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10312 && STRINGP (fmt[PBM_BACKGROUND].value)) |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10313 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10314 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
|
10315 img->background = bg; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10316 img->background_valid = 1; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10317 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10318 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10319 for (y = 0; y < height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10320 for (x = 0; x < width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10321 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10322 if (raw_p) |
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 if ((x & 7) == 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10325 c = *p++; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10326 g = c & 0x80; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10327 c <<= 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10328 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10329 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10330 g = pbm_scan_number (&p, end); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10331 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
10332 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
|
10333 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10334 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10335 else |
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 for (y = 0; y < height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10338 for (x = 0; x < width; ++x) |
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 int r, g, b; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10341 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10342 if (type == PBM_GRAY) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10343 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
|
10344 else if (raw_p) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10345 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10346 r = *p++; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10347 g = *p++; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10348 b = *p++; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10349 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10350 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10351 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10352 r = pbm_scan_number (&p, end); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10353 g = pbm_scan_number (&p, end); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10354 b = pbm_scan_number (&p, end); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10355 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10356 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10357 if (r < 0 || g < 0 || b < 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10358 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10359 x_destroy_x_image (ximg); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10360 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
|
10361 img->spec, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10362 goto error; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10363 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10364 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10365 /* 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
|
10366 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
|
10367 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
|
10368 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
|
10369 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
|
10370 XPutPixel (ximg, x, y, |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10371 #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
|
10372 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
|
10373 #else |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10374 PALETTERGB (r, g, b)); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10375 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10376 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10377 } |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10378 |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10379 #if 0 /* TODO: color tables. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10380 /* 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
|
10381 free the color table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10382 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
|
10383 free_color_table (); |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
10384 #endif |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10385 /* 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
|
10386 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
|
10387 IMAGE_BACKGROUND (img, f, ximg); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
10388 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10389 /* Put the image into a pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10390 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
|
10391 x_destroy_x_image (ximg); |
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 img->width = width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10394 img->height = height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10395 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10396 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10397 xfree (contents); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10398 return 1; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10401 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10402 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10403 PNG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10404 ***********************************************************************/ |
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 #if HAVE_PNG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10407 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10408 #include <png.h> |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10409 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10410 /* Function prototypes. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10411 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10412 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
|
10413 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
|
10414 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10415 /* 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
|
10416 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10417 Lisp_Object Qpng; |
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 /* 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
|
10420 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10421 enum png_keyword_index |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10422 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10423 PNG_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10424 PNG_DATA, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10425 PNG_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10426 PNG_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10427 PNG_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10428 PNG_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10429 PNG_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10430 PNG_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10431 PNG_MASK, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10432 PNG_BACKGROUND, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10433 PNG_LAST |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10434 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10435 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10436 /* 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
|
10437 of valid user-defined image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10438 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10439 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
|
10440 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10441 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10442 {":data", IMAGE_STRING_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10443 {":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
|
10444 {":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
|
10445 {":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
|
10446 {":relief", IMAGE_INTEGER_VALUE, 0}, |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
10447 {":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
|
10448 {":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
|
10449 {":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
|
10450 {":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
|
10451 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10452 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10453 /* Structure describing the image type `png'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10454 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10455 static struct image_type png_type = |
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 &Qpng, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10458 png_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10459 png_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10460 x_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10461 NULL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10462 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10463 |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10464 /* PNG library details. */ |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10465 |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10466 DEF_IMGLIB_FN (png_get_io_ptr); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10467 DEF_IMGLIB_FN (png_check_sig); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10468 DEF_IMGLIB_FN (png_create_read_struct); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10469 DEF_IMGLIB_FN (png_create_info_struct); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10470 DEF_IMGLIB_FN (png_destroy_read_struct); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10471 DEF_IMGLIB_FN (png_set_read_fn); |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10472 DEF_IMGLIB_FN (png_init_io); |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10473 DEF_IMGLIB_FN (png_set_sig_bytes); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10474 DEF_IMGLIB_FN (png_read_info); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10475 DEF_IMGLIB_FN (png_get_IHDR); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10476 DEF_IMGLIB_FN (png_get_valid); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10477 DEF_IMGLIB_FN (png_set_strip_16); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10478 DEF_IMGLIB_FN (png_set_expand); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10479 DEF_IMGLIB_FN (png_set_gray_to_rgb); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10480 DEF_IMGLIB_FN (png_set_background); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10481 DEF_IMGLIB_FN (png_get_bKGD); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10482 DEF_IMGLIB_FN (png_read_update_info); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10483 DEF_IMGLIB_FN (png_get_channels); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10484 DEF_IMGLIB_FN (png_get_rowbytes); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10485 DEF_IMGLIB_FN (png_read_image); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10486 DEF_IMGLIB_FN (png_read_end); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10487 DEF_IMGLIB_FN (png_error); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10488 |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10489 static int |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10490 init_png_functions (library) |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10491 HMODULE library; |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10492 { |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10493 LOAD_IMGLIB_FN (library, png_get_io_ptr); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10494 LOAD_IMGLIB_FN (library, png_check_sig); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10495 LOAD_IMGLIB_FN (library, png_create_read_struct); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10496 LOAD_IMGLIB_FN (library, png_create_info_struct); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10497 LOAD_IMGLIB_FN (library, png_destroy_read_struct); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10498 LOAD_IMGLIB_FN (library, png_set_read_fn); |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10499 LOAD_IMGLIB_FN (library, png_init_io); |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10500 LOAD_IMGLIB_FN (library, png_set_sig_bytes); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10501 LOAD_IMGLIB_FN (library, png_read_info); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10502 LOAD_IMGLIB_FN (library, png_get_IHDR); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10503 LOAD_IMGLIB_FN (library, png_get_valid); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10504 LOAD_IMGLIB_FN (library, png_set_strip_16); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10505 LOAD_IMGLIB_FN (library, png_set_expand); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10506 LOAD_IMGLIB_FN (library, png_set_gray_to_rgb); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10507 LOAD_IMGLIB_FN (library, png_set_background); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10508 LOAD_IMGLIB_FN (library, png_get_bKGD); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10509 LOAD_IMGLIB_FN (library, png_read_update_info); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10510 LOAD_IMGLIB_FN (library, png_get_channels); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10511 LOAD_IMGLIB_FN (library, png_get_rowbytes); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10512 LOAD_IMGLIB_FN (library, png_read_image); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10513 LOAD_IMGLIB_FN (library, png_read_end); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10514 LOAD_IMGLIB_FN (library, png_error); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10515 return 1; |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10516 } |
27397
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 /* 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
|
10519 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10520 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10521 png_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10522 Lisp_Object object; |
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 image_keyword fmt[PNG_LAST]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10525 bcopy (png_format, fmt, sizeof fmt); |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10526 |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
10527 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
|
10528 return 0; |
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 /* 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
|
10531 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
|
10532 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10533 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10534 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10535 /* 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
|
10536 is initialized. */ |
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 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10539 my_png_error (png_ptr, msg) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10540 png_struct *png_ptr; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10541 char *msg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10542 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10543 xassert (png_ptr != NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10544 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
|
10545 longjmp (png_ptr->jmpbuf, 1); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10546 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10547 |
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 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10550 my_png_warning (png_ptr, msg) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10551 png_struct *png_ptr; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10552 char *msg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10553 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10554 xassert (png_ptr != NULL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10555 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
|
10556 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10557 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10558 /* Memory source for PNG decoding. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10559 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10560 struct png_memory_storage |
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 unsigned char *bytes; /* The data */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10563 size_t len; /* How big is it? */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10564 int index; /* Where are we? */ |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10567 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10568 /* 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
|
10569 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
|
10570 bytes from the input to DATA. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10571 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10572 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10573 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
|
10574 png_structp png_ptr; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10575 png_bytep data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10576 png_size_t length; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10577 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10578 struct png_memory_storage *tbr |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10579 = (struct png_memory_storage *) fn_png_get_io_ptr (png_ptr); |
27397
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 if (length > tbr->len - tbr->index) |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10582 fn_png_error (png_ptr, "Read error"); |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10583 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10584 bcopy (tbr->bytes + tbr->index, data, length); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10585 tbr->index = tbr->index + length; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10586 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10587 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10588 /* 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
|
10589 successful. */ |
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 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10592 png_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10593 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10594 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10595 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10596 Lisp_Object file, specified_file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10597 Lisp_Object specified_data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10598 int x, y, i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10599 XImage *ximg, *mask_img = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10600 struct gcpro gcpro1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10601 png_struct *png_ptr = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10602 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
|
10603 FILE *volatile fp = NULL; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10604 png_byte sig[8]; |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10605 png_byte * volatile pixels = NULL; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10606 png_byte ** volatile rows = NULL; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10607 png_uint_32 width, height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10608 int bit_depth, color_type, interlace_type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10609 png_byte channels; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10610 png_uint_32 row_bytes; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10611 int transparent_p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10612 double screen_gamma, image_gamma; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10613 int intent; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10614 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
|
10615 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10616 /* Find out what file to load. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10617 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
|
10618 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
|
10619 file = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10620 GCPRO1 (file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10621 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10622 if (NILP (specified_data)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10623 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10624 file = x_find_image_file (specified_file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10625 if (!STRINGP (file)) |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10626 { |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10627 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10628 UNGCPRO; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10629 return 0; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10630 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10631 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10632 /* 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
|
10633 fp = fopen (SDATA (file), "rb"); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10634 if (!fp) |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10635 { |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10636 image_error ("Cannot open image file `%s'", file, Qnil); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10637 UNGCPRO; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10638 fclose (fp); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10639 return 0; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10640 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10641 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10642 /* Check PNG signature. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10643 if (fread (sig, 1, sizeof sig, fp) != sizeof sig |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10644 || !fn_png_check_sig (sig, sizeof sig)) |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10645 { |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10646 image_error ("Not a PNG file: `%s'", file, Qnil); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10647 UNGCPRO; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10648 fclose (fp); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10649 return 0; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10650 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10651 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10652 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10653 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10654 /* 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
|
10655 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
|
10656 tbr.len = SBYTES (specified_data); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10657 tbr.index = 0; |
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 /* Check PNG signature. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10660 if (tbr.len < sizeof sig |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10661 || !fn_png_check_sig (tbr.bytes, sizeof sig)) |
27397
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 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
|
10664 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10665 return 0; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10668 /* Need to skip past the signature. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10669 tbr.bytes += sizeof (sig); |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10672 /* Initialize read and info structs for PNG lib. */ |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10673 png_ptr = fn_png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10674 my_png_error, my_png_warning); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10675 if (!png_ptr) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10676 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10677 if (fp) fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10678 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10679 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10680 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10681 |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10682 info_ptr = fn_png_create_info_struct (png_ptr); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10683 if (!info_ptr) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10684 { |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10685 fn_png_destroy_read_struct (&png_ptr, NULL, NULL); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10686 if (fp) fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10687 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10688 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10689 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10690 |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10691 end_info = fn_png_create_info_struct (png_ptr); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10692 if (!end_info) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10693 { |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10694 fn_png_destroy_read_struct (&png_ptr, &info_ptr, NULL); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10695 if (fp) fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10696 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10697 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10698 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10699 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10700 /* 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
|
10701 detects an error. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10702 if (setjmp (png_ptr->jmpbuf)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10703 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10704 error: |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10705 if (png_ptr) |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10706 fn_png_destroy_read_struct (&png_ptr, &info_ptr, &end_info); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10707 xfree (pixels); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10708 xfree (rows); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10709 if (fp) fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10710 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10711 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10712 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10713 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10714 /* Read image info. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10715 if (!NILP (specified_data)) |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10716 fn_png_set_read_fn (png_ptr, (void *) &tbr, png_read_from_memory); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10717 else |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10718 fn_png_init_io (png_ptr, fp); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10719 |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10720 fn_png_set_sig_bytes (png_ptr, sizeof sig); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10721 fn_png_read_info (png_ptr, info_ptr); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10722 fn_png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10723 &interlace_type, NULL, NULL); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10724 |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10725 /* 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
|
10726 construct a clipping mask. */ |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10727 if (fn_png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10728 transparent_p = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10729 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10730 transparent_p = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10731 |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10732 /* 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
|
10733 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
|
10734 transform other formats into that format. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10735 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10736 /* Strip more than 8 bits per channel. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10737 if (bit_depth == 16) |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10738 fn_png_set_strip_16 (png_ptr); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10739 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10740 /* 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
|
10741 if available. */ |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10742 fn_png_set_expand (png_ptr); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10743 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10744 /* Convert grayscale images to RGB. */ |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10745 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
|
10746 || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10747 fn_png_set_gray_to_rgb (png_ptr); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10748 |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10749 screen_gamma = (f->gamma ? 1 / f->gamma / 0.45455 : 2.2); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10750 |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10751 #if 0 /* Avoid double gamma correction for PNG images. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10752 /* 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
|
10753 #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
|
10754 if (png_get_sRGB (png_ptr, info_ptr, &intent)) |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10755 /* The libpng documentation says this is right in this case. */ |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10756 png_set_gamma (png_ptr, screen_gamma, 0.45455); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10757 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10758 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10759 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
|
10760 /* Image contains gamma information. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10761 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
|
10762 else |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10763 /* Use the standard default for the image gamma. */ |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10764 png_set_gamma (png_ptr, screen_gamma, 0.45455); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10765 #endif /* if 0 */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10766 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10767 /* 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
|
10768 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
|
10769 simple transparency, we prefer a clipping mask. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10770 if (!transparent_p) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10771 { |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10772 png_color_16 *image_bg; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10773 Lisp_Object specified_bg |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10774 = 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
|
10775 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10776 if (STRINGP (specified_bg)) |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10777 /* The user specified `:background', use that. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10778 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10779 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
|
10780 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
|
10781 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10782 png_color_16 user_bg; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10783 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10784 bzero (&user_bg, sizeof user_bg); |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10785 user_bg.red = 256 * GetRValue (color); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10786 user_bg.green = 256 * GetGValue (color); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10787 user_bg.blue = 256 * GetBValue (color); |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10788 |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10789 fn_png_set_background (png_ptr, &user_bg, |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10790 PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10791 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10792 } |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10793 else if (fn_png_get_bKGD (png_ptr, info_ptr, &image_bg)) |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10794 /* 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
|
10795 combine the image. */ |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10796 fn_png_set_background (png_ptr, image_bg, |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10797 PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10798 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10799 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10800 /* Image does not contain a background color with which |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10801 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
|
10802 the frame's background instead. */ |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10803 COLORREF color; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10804 png_color_16 frame_background; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10805 color = FRAME_BACKGROUND_PIXEL (f); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10806 #if 0 /* TODO : Colormap support. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10807 Colormap cmap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10808 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10809 cmap = FRAME_X_COLORMAP (f); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10810 x_query_color (f, &color); |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10811 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10812 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10813 bzero (&frame_background, sizeof frame_background); |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10814 frame_background.red = 256 * GetRValue (color); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10815 frame_background.green = 256 * GetGValue (color); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10816 frame_background.blue = 256 * GetBValue (color); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10817 |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10818 fn_png_set_background (png_ptr, &frame_background, |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10819 PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10820 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10821 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10822 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10823 /* Update info structure. */ |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10824 fn_png_read_update_info (png_ptr, info_ptr); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10825 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10826 /* 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
|
10827 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
|
10828 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
|
10829 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
|
10830 sufficient we should only have 3 or 4 channels here. */ |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10831 channels = fn_png_get_channels (png_ptr, info_ptr); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10832 xassert (channels == 3 || channels == 4); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10833 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10834 /* Number of bytes needed for one row of the image. */ |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10835 row_bytes = fn_png_get_rowbytes (png_ptr, info_ptr); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10836 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10837 /* Allocate memory for the image. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10838 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
|
10839 rows = (png_byte **) xmalloc (height * sizeof *rows); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10840 for (i = 0; i < height; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10841 rows[i] = pixels + i * row_bytes; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10842 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10843 /* Read the entire image. */ |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10844 fn_png_read_image (png_ptr, rows); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10845 fn_png_read_end (png_ptr, info_ptr); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10846 if (fp) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10847 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10848 fclose (fp); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10849 fp = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10850 } |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10851 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10852 /* Create the X image and pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10853 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
|
10854 &img->pixmap)) |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10855 goto error; |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10856 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10857 /* 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
|
10858 contains an alpha channel. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10859 if (channels == 4 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10860 && !transparent_p |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10861 && !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
|
10862 &mask_img, &img->mask)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10863 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10864 x_destroy_x_image (ximg); |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10865 DeleteObject (img->pixmap); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10866 img->pixmap = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10867 goto error; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10868 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10869 /* Fill the X image and mask from PNG data. */ |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10870 #if 0 /* TODO: Color tables. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10871 init_color_table (); |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10872 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10873 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10874 for (y = 0; y < height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10875 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10876 png_byte *p = rows[y]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10877 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10878 for (x = 0; x < width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10879 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10880 unsigned r, g, b; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10881 |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10882 r = *p++; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10883 g = *p++; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10884 b = *p++; |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10885 #if 0 /* TODO: Color tables. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10886 XPutPixel (ximg, x, y, lookup_rgb_color (f, r, g, b)); |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10887 #else |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10888 XPutPixel (ximg, x, y, PALETTERGB (r, g, b)); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10889 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10890 /* An alpha channel, aka mask channel, associates variable |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10891 transparency with an image. Where other image formats |
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10892 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
|
10893 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
|
10894 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
|
10895 the image with a specified background color. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10896 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10897 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
|
10898 background on which the image is displayed may change, for |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10899 real alpha channel support, it would be necessary to create |
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
10900 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
|
10901 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10902 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
|
10903 boolean transparency information. Otherwise I'm using |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10904 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
|
10905 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10906 if (channels == 4) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10907 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10908 if (mask_img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10909 XPutPixel (mask_img, x, y, *p > 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10910 ++p; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10911 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10912 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10913 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10914 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10915 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
|
10916 /* 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
|
10917 overrode it. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10918 { |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10919 png_color_16 *bg; |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10920 if (fn_png_get_bKGD (png_ptr, info_ptr, &bg)) |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10921 { |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10922 #if 0 /* TODO: Color tables. */ |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10923 img->background = lookup_rgb_color (f, bg->red, bg->green, bg->blue); |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10924 #else |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10925 img->background = PALETTERGB (bg->red / 256, bg->green / 256, |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10926 bg->blue / 256); |
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10927 #endif |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10928 img->background_valid = 1; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10929 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10930 } |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10931 |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10932 #if 0 /* TODO: Color tables. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10933 /* Remember colors allocated for this image. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10934 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
|
10935 free_color_table (); |
49432
8185febf8361
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49392
diff
changeset
|
10936 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10937 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10938 /* Clean up. */ |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
10939 fn_png_destroy_read_struct (&png_ptr, &info_ptr, &end_info); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10940 xfree (rows); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10941 xfree (pixels); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10942 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10943 img->width = width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10944 img->height = height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10945 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10946 /* 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
|
10947 IMAGE_BACKGROUND (img, f, ximg); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10948 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10949 /* 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
|
10950 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
|
10951 x_destroy_x_image (ximg); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10952 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10953 /* Same for the mask. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10954 if (mask_img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10955 { |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10956 /* 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
|
10957 handy. */ |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
10958 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
|
10959 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10960 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
|
10961 x_destroy_x_image (mask_img); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10962 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10963 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10964 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10965 return 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10966 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10967 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10968 #endif /* HAVE_PNG != 0 */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10969 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10970 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10971 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10972 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10973 JPEG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10974 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10975 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10976 #if HAVE_JPEG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10977 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10978 /* 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
|
10979 jconfig.h. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10980 #ifdef HAVE_STDLIB_H |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10981 #define HAVE_STDLIB_H_1 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10982 #undef HAVE_STDLIB_H |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10983 #endif /* HAVE_STLIB_H */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10984 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10985 #include <jpeglib.h> |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10986 #include <jerror.h> |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10987 #include <setjmp.h> |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10988 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10989 #ifdef HAVE_STLIB_H_1 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10990 #define HAVE_STDLIB_H 1 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10991 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10992 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10993 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
|
10994 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
|
10995 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10996 /* 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
|
10997 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10998 Lisp_Object Qjpeg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
10999 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11000 /* 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
|
11001 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11002 enum jpeg_keyword_index |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11003 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11004 JPEG_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11005 JPEG_DATA, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11006 JPEG_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11007 JPEG_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11008 JPEG_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11009 JPEG_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11010 JPEG_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11011 JPEG_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11012 JPEG_MASK, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11013 JPEG_BACKGROUND, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11014 JPEG_LAST |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11015 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11016 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11017 /* 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
|
11018 of valid user-defined image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11019 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11020 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
|
11021 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11022 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11023 {":data", IMAGE_STRING_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11024 {":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
|
11025 {":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
|
11026 {":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
|
11027 {":relief", IMAGE_INTEGER_VALUE, 0}, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11028 {":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
|
11029 {":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
|
11030 {":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
|
11031 {":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
|
11032 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11033 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11034 /* Structure describing the image type `jpeg'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11035 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11036 static struct image_type jpeg_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11037 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11038 &Qjpeg, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11039 jpeg_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11040 jpeg_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11041 x_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11042 NULL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11043 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11044 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11045 |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11046 /* JPEG library details. */ |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11047 DEF_IMGLIB_FN (jpeg_CreateDecompress); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11048 DEF_IMGLIB_FN (jpeg_start_decompress); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11049 DEF_IMGLIB_FN (jpeg_finish_decompress); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11050 DEF_IMGLIB_FN (jpeg_destroy_decompress); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11051 DEF_IMGLIB_FN (jpeg_read_header); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11052 DEF_IMGLIB_FN (jpeg_read_scanlines); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11053 DEF_IMGLIB_FN (jpeg_stdio_src); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11054 DEF_IMGLIB_FN (jpeg_std_error); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11055 DEF_IMGLIB_FN (jpeg_resync_to_restart); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11056 |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11057 static int |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11058 init_jpeg_functions (library) |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11059 HMODULE library; |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11060 { |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11061 LOAD_IMGLIB_FN (library, jpeg_finish_decompress); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11062 LOAD_IMGLIB_FN (library, jpeg_read_scanlines); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11063 LOAD_IMGLIB_FN (library, jpeg_start_decompress); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11064 LOAD_IMGLIB_FN (library, jpeg_read_header); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11065 LOAD_IMGLIB_FN (library, jpeg_stdio_src); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11066 LOAD_IMGLIB_FN (library, jpeg_CreateDecompress); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11067 LOAD_IMGLIB_FN (library, jpeg_destroy_decompress); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11068 LOAD_IMGLIB_FN (library, jpeg_std_error); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11069 LOAD_IMGLIB_FN (library, jpeg_resync_to_restart); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11070 return 1; |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11071 } |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11072 |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11073 /* Wrapper since we can't directly assign the function pointer |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11074 to another function pointer that was declared more completely easily. */ |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11075 static boolean |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11076 jpeg_resync_to_restart_wrapper(cinfo, desired) |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11077 j_decompress_ptr cinfo; |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11078 int desired; |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11079 { |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11080 return fn_jpeg_resync_to_restart (cinfo, desired); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11081 } |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11082 |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11083 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11084 /* 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
|
11085 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11086 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11087 jpeg_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11088 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11089 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11090 struct image_keyword fmt[JPEG_LAST]; |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
11091 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11092 bcopy (jpeg_format, fmt, sizeof fmt); |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
11093 |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
11094 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
|
11095 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11096 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11097 /* 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
|
11098 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
|
11099 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11100 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11101 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11102 struct my_jpeg_error_mgr |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11103 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11104 struct jpeg_error_mgr pub; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11105 jmp_buf setjmp_buffer; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11106 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11107 |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11108 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11109 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11110 my_error_exit (cinfo) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11111 j_common_ptr cinfo; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11112 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11113 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
|
11114 longjmp (mgr->setjmp_buffer, 1); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11115 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11116 |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11117 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11118 /* 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
|
11119 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
|
11120 libjpeg.doc from the JPEG lib distribution. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11121 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11122 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11123 our_init_source (cinfo) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11124 j_decompress_ptr cinfo; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11125 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11126 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11127 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11128 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11129 /* 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
|
11130 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
|
11131 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
|
11132 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11133 static boolean |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11134 our_fill_input_buffer (cinfo) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11135 j_decompress_ptr cinfo; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11136 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11137 /* Insert a fake EOI marker. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11138 struct jpeg_source_mgr *src = cinfo->src; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11139 static JOCTET buffer[2]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11140 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11141 buffer[0] = (JOCTET) 0xFF; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11142 buffer[1] = (JOCTET) JPEG_EOI; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11143 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11144 src->next_input_byte = buffer; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11145 src->bytes_in_buffer = 2; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11146 return TRUE; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11147 } |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11150 /* 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
|
11151 is the JPEG data source manager. */ |
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 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11154 our_skip_input_data (cinfo, num_bytes) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11155 j_decompress_ptr cinfo; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11156 long num_bytes; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11157 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11158 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
|
11159 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11160 if (src) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11161 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11162 if (num_bytes > src->bytes_in_buffer) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11163 ERREXIT (cinfo, JERR_INPUT_EOF); |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
11164 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11165 src->bytes_in_buffer -= num_bytes; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11166 src->next_input_byte += num_bytes; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11167 } |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11170 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11171 /* Method to terminate data source. Called by |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11172 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
|
11173 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11174 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11175 our_term_source (cinfo) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11176 j_decompress_ptr cinfo; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11177 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11178 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11179 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11180 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11181 /* 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
|
11182 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
|
11183 reading the image. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11184 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11185 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11186 jpeg_memory_src (cinfo, data, len) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11187 j_decompress_ptr cinfo; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11188 JOCTET *data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11189 unsigned int len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11190 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11191 struct jpeg_source_mgr *src; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11192 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11193 if (cinfo->src == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11194 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11195 /* First time for this JPEG object? */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11196 cinfo->src = (struct jpeg_source_mgr *) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11197 (*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
|
11198 sizeof (struct jpeg_source_mgr)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11199 src = (struct jpeg_source_mgr *) cinfo->src; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11200 src->next_input_byte = data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11201 } |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
11202 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11203 src = (struct jpeg_source_mgr *) cinfo->src; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11204 src->init_source = our_init_source; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11205 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
|
11206 src->skip_input_data = our_skip_input_data; |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11207 src->resync_to_restart = jpeg_resync_to_restart_wrapper; /* Use default method. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11208 src->term_source = our_term_source; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11209 src->bytes_in_buffer = len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11210 src->next_input_byte = data; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11214 /* 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
|
11215 from the JPEG lib. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11216 |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
11217 static int |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11218 jpeg_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11219 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11220 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11221 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11222 struct jpeg_decompress_struct cinfo; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11223 struct my_jpeg_error_mgr mgr; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11224 Lisp_Object file, specified_file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11225 Lisp_Object specified_data; |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11226 FILE * volatile fp = NULL; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11227 JSAMPARRAY buffer; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11228 int row_stride, x, y; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11229 XImage *ximg = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11230 int rc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11231 unsigned long *colors; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11232 int width, height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11233 struct gcpro gcpro1; |
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 /* Open the JPEG file. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11236 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
|
11237 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
|
11238 file = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11239 GCPRO1 (file); |
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 if (NILP (specified_data)) |
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 file = x_find_image_file (specified_file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11244 if (!STRINGP (file)) |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11245 { |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11246 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11247 UNGCPRO; |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11248 return 0; |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11249 } |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
11250 |
50164
61b178f7f6dc
(jpeg_load, png_load, slurp_file): Read image files
Jason Rumney <jasonr@gnu.org>
parents:
50099
diff
changeset
|
11251 fp = fopen (SDATA (file), "rb"); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11252 if (fp == NULL) |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11253 { |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11254 image_error ("Cannot open `%s'", file, Qnil); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11255 UNGCPRO; |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11256 return 0; |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11257 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11258 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11259 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11260 /* Customize libjpeg's error handling to call my_error_exit when an |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11261 error is detected. This function will perform a longjmp. */ |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11262 cinfo.err = fn_jpeg_std_error (&mgr.pub); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11263 mgr.pub.error_exit = my_error_exit; |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
11264 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11265 if ((rc = setjmp (mgr.setjmp_buffer)) != 0) |
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 if (rc == 1) |
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 /* 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
|
11270 char buffer[JMSG_LENGTH_MAX]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11271 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
|
11272 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
|
11273 build_string (buffer)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11274 } |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
11275 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11276 /* 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
|
11277 if (fp) |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11278 fclose ((FILE *) fp); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11279 fn_jpeg_destroy_decompress (&cinfo); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11280 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11281 /* 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
|
11282 x_destroy_x_image (ximg); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11283 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11284 /* Free pixmap and colors. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11285 x_clear_image (f, img); |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
11286 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11287 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11288 return 0; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11291 /* Create the JPEG decompression object. Let it read from fp. |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11292 Read the JPEG image header. */ |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11293 fn_jpeg_CreateDecompress (&cinfo, JPEG_LIB_VERSION, sizeof (cinfo)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11294 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11295 if (NILP (specified_data)) |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11296 fn_jpeg_stdio_src (&cinfo, (FILE *) fp); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11297 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
11298 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
|
11299 SBYTES (specified_data)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11300 |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11301 fn_jpeg_read_header (&cinfo, TRUE); |
27397
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 /* Customize decompression so that color quantization will be used. |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11304 Start decompression. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11305 cinfo.quantize_colors = TRUE; |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11306 fn_jpeg_start_decompress (&cinfo); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11307 width = img->width = cinfo.output_width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11308 height = img->height = cinfo.output_height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11309 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11310 /* Create X image and pixmap. */ |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11311 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11312 longjmp (mgr.setjmp_buffer, 2); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11313 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11314 /* Allocate colors. When color quantization is used, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11315 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
|
11316 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
|
11317 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
|
11318 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
|
11319 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11320 int i, ir, ig, ib; |
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 if (cinfo.out_color_components > 2) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11323 ir = 0, ig = 1, ib = 2; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11324 else if (cinfo.out_color_components > 1) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11325 ir = 0, ig = 1, ib = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11326 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11327 ir = 0, ig = 0, ib = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11328 |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11329 #if 0 /* TODO: Color tables. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11330 /* 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
|
11331 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
|
11332 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
|
11333 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
|
11334 init_color_table (); |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11335 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11336 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
|
11337 * sizeof *colors); |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
11338 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11339 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
|
11340 { |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11341 int r = cinfo.colormap[ir][i]; |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11342 int g = cinfo.colormap[ig][i]; |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11343 int b = cinfo.colormap[ib][i]; |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11344 #if 0 /* TODO: Color tables. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11345 colors[i] = lookup_rgb_color (f, r, g, b); |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11346 #else |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11347 colors[i] = PALETTERGB (r, g, b); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11348 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11349 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11350 |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11351 #if 0 /* TODO: Color tables. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11352 /* Remember those colors actually allocated. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11353 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
|
11354 free_color_table (); |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11355 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11356 } |
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 /* Read pixels. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11359 row_stride = width * cinfo.output_components; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11360 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
|
11361 row_stride, 1); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11362 for (y = 0; y < height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11363 { |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11364 fn_jpeg_read_scanlines (&cinfo, buffer, 1); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11365 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
|
11366 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
|
11367 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11368 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11369 /* Clean up. */ |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11370 fn_jpeg_finish_decompress (&cinfo); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11371 fn_jpeg_destroy_decompress (&cinfo); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11372 if (fp) |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
11373 fclose ((FILE *) fp); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11374 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11375 /* 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
|
11376 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
|
11377 IMAGE_BACKGROUND (img, f, ximg); |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
11378 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11379 /* Put the image into the pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11380 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
|
11381 x_destroy_x_image (ximg); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11382 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11383 return 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11384 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11385 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11386 #endif /* HAVE_JPEG */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11387 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11388 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11389 |
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 TIFF |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11392 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11393 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11394 #if HAVE_TIFF |
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 #include <tiffio.h> |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11397 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11398 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
|
11399 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
|
11400 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11401 /* 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
|
11402 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11403 Lisp_Object Qtiff; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11404 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11405 /* 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
|
11406 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11407 enum tiff_keyword_index |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11408 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11409 TIFF_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11410 TIFF_DATA, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11411 TIFF_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11412 TIFF_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11413 TIFF_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11414 TIFF_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11415 TIFF_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11416 TIFF_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11417 TIFF_MASK, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11418 TIFF_BACKGROUND, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11419 TIFF_LAST |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11422 /* 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
|
11423 of valid user-defined image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11424 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11425 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
|
11426 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11427 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11428 {":data", IMAGE_STRING_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11429 {":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
|
11430 {":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
|
11431 {":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
|
11432 {":relief", IMAGE_INTEGER_VALUE, 0}, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11433 {":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
|
11434 {":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
|
11435 {":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
|
11436 {":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
|
11437 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11438 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11439 /* Structure describing the image type `tiff'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11440 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11441 static struct image_type tiff_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11442 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11443 &Qtiff, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11444 tiff_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11445 tiff_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11446 x_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11447 NULL |
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 |
49543
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11450 /* TIFF library details. */ |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11451 DEF_IMGLIB_FN (TIFFSetErrorHandler); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11452 DEF_IMGLIB_FN (TIFFSetWarningHandler); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11453 DEF_IMGLIB_FN (TIFFOpen); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11454 DEF_IMGLIB_FN (TIFFClientOpen); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11455 DEF_IMGLIB_FN (TIFFGetField); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11456 DEF_IMGLIB_FN (TIFFReadRGBAImage); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11457 DEF_IMGLIB_FN (TIFFClose); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11458 |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11459 static int |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11460 init_tiff_functions (library) |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11461 HMODULE library; |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11462 { |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11463 LOAD_IMGLIB_FN (library, TIFFSetErrorHandler); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11464 LOAD_IMGLIB_FN (library, TIFFSetWarningHandler); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11465 LOAD_IMGLIB_FN (library, TIFFOpen); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11466 LOAD_IMGLIB_FN (library, TIFFClientOpen); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11467 LOAD_IMGLIB_FN (library, TIFFGetField); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11468 LOAD_IMGLIB_FN (library, TIFFReadRGBAImage); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11469 LOAD_IMGLIB_FN (library, TIFFClose); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11470 return 1; |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11471 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11472 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11473 /* 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
|
11474 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11475 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11476 tiff_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11477 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11478 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11479 struct image_keyword fmt[TIFF_LAST]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11480 bcopy (tiff_format, fmt, sizeof fmt); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11481 |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
11482 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
|
11483 return 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11484 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11485 /* 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
|
11486 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
|
11487 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11488 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11489 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11490 /* 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
|
11491 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
|
11492 Blah. |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11493 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11494 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
|
11495 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
|
11496 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
|
11497 override. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11498 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11499 typedef struct |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11500 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11501 unsigned char *bytes; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11502 size_t len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11503 int index; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11504 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11505 tiff_memory_source; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11506 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11507 static size_t |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11508 tiff_read_from_memory (data, buf, size) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11509 thandle_t data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11510 tdata_t buf; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11511 tsize_t size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11512 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11513 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
|
11514 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11515 if (size > src->len - src->index) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11516 return (size_t) -1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11517 bcopy (src->bytes + src->index, buf, size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11518 src->index += size; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11519 return size; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11522 static size_t |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11523 tiff_write_from_memory (data, buf, size) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11524 thandle_t data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11525 tdata_t buf; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11526 tsize_t size; |
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 return (size_t) -1; |
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 static toff_t |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11532 tiff_seek_in_memory (data, off, whence) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11533 thandle_t data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11534 toff_t off; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11535 int whence; |
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 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
|
11538 int idx; |
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 switch (whence) |
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 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
|
11543 idx = off; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11544 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11545 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11546 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
|
11547 idx = src->len + off; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11548 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11549 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11550 case SEEK_CUR: /* Go from current position. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11551 idx = src->index + off; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11552 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11553 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11554 default: /* Invalid `whence'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11555 return -1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11556 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11557 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11558 if (idx > src->len || idx < 0) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11559 return -1; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11560 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11561 src->index = idx; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11562 return src->index; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11565 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11566 tiff_close_memory (data) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11567 thandle_t data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11568 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11569 /* NOOP */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11570 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11571 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11572 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11573 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11574 tiff_mmap_memory (data, pbase, psize) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11575 thandle_t data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11576 tdata_t *pbase; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11577 toff_t *psize; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11578 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11579 /* It is already _IN_ memory. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11580 return 0; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11583 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11584 tiff_unmap_memory (data, base, size) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11585 thandle_t data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11586 tdata_t base; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11587 toff_t size; |
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 /* We don't need to do this. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11590 } |
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 toff_t |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11593 tiff_size_of_memory (data) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11594 thandle_t data; |
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 return ((tiff_memory_source *) data)->len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11597 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11598 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11599 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11600 static void |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11601 tiff_error_handler (title, format, ap) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11602 const char *title, *format; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11603 va_list ap; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11604 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11605 char buf[512]; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11606 int len; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11607 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11608 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
|
11609 vsprintf (buf + len, format, ap); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11610 add_to_log (buf, Qnil, Qnil); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11611 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11612 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11613 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11614 static void |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11615 tiff_warning_handler (title, format, ap) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11616 const char *title, *format; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11617 va_list ap; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11618 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11619 char buf[512]; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11620 int len; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11621 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11622 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
|
11623 vsprintf (buf + len, format, ap); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11624 add_to_log (buf, Qnil, Qnil); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11625 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11626 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11627 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11628 /* 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
|
11629 successful. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11630 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11631 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11632 tiff_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11633 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11634 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11635 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11636 Lisp_Object file, specified_file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11637 Lisp_Object specified_data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11638 TIFF *tiff; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11639 int width, height, x, y; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11640 uint32 *buf; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11641 int rc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11642 XImage *ximg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11643 struct gcpro gcpro1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11644 tiff_memory_source memsrc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11645 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11646 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
|
11647 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
|
11648 file = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11649 GCPRO1 (file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11650 |
49543
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11651 fn_TIFFSetErrorHandler (tiff_error_handler); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11652 fn_TIFFSetWarningHandler (tiff_warning_handler); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11653 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11654 if (NILP (specified_data)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11655 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11656 /* Read from a file */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11657 file = x_find_image_file (specified_file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11658 if (!STRINGP (file)) |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11659 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11660 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
|
11661 UNGCPRO; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11662 return 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11663 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11664 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11665 /* Try to open the image file. */ |
49543
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11666 tiff = fn_TIFFOpen (SDATA (file), "r"); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11667 if (tiff == NULL) |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11668 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11669 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
|
11670 UNGCPRO; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11671 return 0; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
11672 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11673 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11674 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11675 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11676 /* 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
|
11677 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
|
11678 memsrc.len = SBYTES (specified_data); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11679 memsrc.index = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11680 |
49543
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11681 tiff = fn_TIFFClientOpen ("memory_source", "r", &memsrc, |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11682 (TIFFReadWriteProc) tiff_read_from_memory, |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11683 (TIFFReadWriteProc) tiff_write_from_memory, |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11684 tiff_seek_in_memory, |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11685 tiff_close_memory, |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11686 tiff_size_of_memory, |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11687 tiff_mmap_memory, |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11688 tiff_unmap_memory); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11689 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11690 if (!tiff) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11691 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11692 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
|
11693 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11694 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11695 } |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11698 /* 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
|
11699 of width x height 32-bit values. */ |
49543
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11700 fn_TIFFGetField (tiff, TIFFTAG_IMAGEWIDTH, &width); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11701 fn_TIFFGetField (tiff, TIFFTAG_IMAGELENGTH, &height); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11702 buf = (uint32 *) xmalloc (width * height * sizeof *buf); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11703 |
49543
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11704 rc = fn_TIFFReadRGBAImage (tiff, width, height, buf, 0); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11705 fn_TIFFClose (tiff); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11706 if (!rc) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11707 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11708 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
|
11709 xfree (buf); |
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 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11712 } |
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 /* Create the X image and pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11715 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
|
11716 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11717 xfree (buf); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11718 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11719 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11720 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11721 |
49543
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11722 #if 0 /* TODO: Color tables. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11723 /* Initialize the color table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11724 init_color_table (); |
49543
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11725 #endif |
27397
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 /* 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
|
11728 for (y = 0; y < height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11729 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11730 uint32 *row = buf + y * width; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11731 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11732 for (x = 0; x < width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11733 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11734 uint32 abgr = row[x]; |
49543
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11735 int r = TIFFGetR (abgr); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11736 int g = TIFFGetG (abgr); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11737 int b = TIFFGetB (abgr); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11738 #if 0 /* TODO: Color tables. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11739 XPutPixel (ximg, x, height - 1 - y, lookup_rgb_color (f, r, g, b)); |
49543
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11740 #else |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11741 XPutPixel (ximg, x, height - 1 - y, PALETTERGB (r, g, b)); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11742 #endif |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11743 } |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11744 } |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11745 |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11746 #if 0 /* TODO: Color tables. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11747 /* 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
|
11748 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
|
11749 free_color_table (); |
49543
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
11750 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11751 |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11752 img->width = width; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11753 img->height = height; |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11754 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11755 /* 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
|
11756 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
|
11757 IMAGE_BACKGROUND (img, f, ximg); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11758 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11759 /* 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
|
11760 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
|
11761 x_destroy_x_image (ximg); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11762 xfree (buf); |
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 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11765 return 1; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11768 #endif /* HAVE_TIFF != 0 */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11769 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11770 |
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 GIF |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11774 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11775 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11776 #if HAVE_GIF |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11777 |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11778 #define DrawText gif_DrawText |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11779 #include <gif_lib.h> |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11780 #undef DrawText |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11781 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11782 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
|
11783 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
|
11784 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11785 /* 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
|
11786 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11787 Lisp_Object Qgif; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11788 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11789 /* 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
|
11790 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11791 enum gif_keyword_index |
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 GIF_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11794 GIF_DATA, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11795 GIF_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11796 GIF_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11797 GIF_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11798 GIF_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11799 GIF_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11800 GIF_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11801 GIF_MASK, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11802 GIF_IMAGE, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
11803 GIF_BACKGROUND, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11804 GIF_LAST |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11805 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11806 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11807 /* 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
|
11808 of valid user-defined image specifications. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11809 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11810 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
|
11811 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11812 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11813 {":data", IMAGE_STRING_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11814 {":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
|
11815 {":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
|
11816 {":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
|
11817 {":relief", IMAGE_INTEGER_VALUE, 0}, |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
11818 {":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
|
11819 {":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
|
11820 {":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
|
11821 {":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
|
11822 {":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
|
11823 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11824 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11825 /* Structure describing the image type `gif'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11826 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11827 static struct image_type gif_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11828 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11829 &Qgif, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11830 gif_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11831 gif_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11832 x_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11833 NULL |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11834 }; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11835 |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11836 |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11837 /* GIF library details. */ |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11838 DEF_IMGLIB_FN (DGifCloseFile); |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11839 DEF_IMGLIB_FN (DGifSlurp); |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11840 DEF_IMGLIB_FN (DGifOpen); |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11841 DEF_IMGLIB_FN (DGifOpenFileName); |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11842 |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11843 static int |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11844 init_gif_functions (library) |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11845 HMODULE library; |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11846 { |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11847 LOAD_IMGLIB_FN (library, DGifCloseFile); |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11848 LOAD_IMGLIB_FN (library, DGifSlurp); |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11849 LOAD_IMGLIB_FN (library, DGifOpen); |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11850 LOAD_IMGLIB_FN (library, DGifOpenFileName); |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11851 return 1; |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11852 } |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11853 |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11854 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11855 /* 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
|
11856 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11857 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11858 gif_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11859 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11860 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11861 struct image_keyword fmt[GIF_LAST]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11862 bcopy (gif_format, fmt, sizeof fmt); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11863 |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
11864 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
|
11865 return 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11866 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11867 /* 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
|
11868 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
|
11869 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11870 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11871 /* Reading a GIF image from memory |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11872 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
|
11873 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11874 typedef struct |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11875 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11876 unsigned char *bytes; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11877 size_t len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11878 int index; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11879 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11880 gif_memory_source; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11881 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11882 /* 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
|
11883 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
|
11884 a UserData field in the GifFileType structure. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11885 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
|
11886 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11887 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11888 gif_read_from_memory (file, buf, len) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11889 GifFileType *file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11890 GifByteType *buf; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11891 int len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11892 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11893 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
|
11894 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11895 if (len > src->len - src->index) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11896 return -1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11897 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11898 bcopy (src->bytes + src->index, buf, len); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11899 src->index += len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11900 return len; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11901 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11902 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11903 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11904 /* 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
|
11905 successful. */ |
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 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11908 gif_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11909 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11910 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11911 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11912 Lisp_Object file, specified_file; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11913 Lisp_Object specified_data; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11914 int rc, width, height, x, y, i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11915 XImage *ximg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11916 ColorMapObject *gif_color_map; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11917 unsigned long pixel_colors[256]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11918 GifFileType *gif; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11919 struct gcpro gcpro1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11920 Lisp_Object image; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11921 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
|
11922 gif_memory_source memsrc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11923 unsigned char *raster; |
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 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
|
11926 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
|
11927 file = Qnil; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
11928 GCPRO1 (file); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11929 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11930 if (NILP (specified_data)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11931 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11932 file = x_find_image_file (specified_file); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11933 if (!STRINGP (file)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11934 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11935 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
|
11936 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11937 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11938 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11939 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11940 /* Open the GIF file. */ |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11941 gif = fn_DGifOpenFileName (SDATA (file)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11942 if (gif == NULL) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11943 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11944 image_error ("Cannot open `%s'", file, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11945 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11946 return 0; |
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 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11949 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11950 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11951 /* Read from memory! */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11952 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
|
11953 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
|
11954 memsrc.len = SBYTES (specified_data); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11955 memsrc.index = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11956 |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11957 gif = fn_DGifOpen(&memsrc, gif_read_from_memory); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11958 if (!gif) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11959 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11960 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
|
11961 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11962 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11963 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11964 } |
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 /* Read entire contents. */ |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11967 rc = fn_DGifSlurp (gif); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11968 if (rc == GIF_ERROR) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11969 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11970 image_error ("Error reading `%s'", img->spec, Qnil); |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11971 fn_DGifCloseFile (gif); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11972 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11973 return 0; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11976 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
|
11977 ino = INTEGERP (image) ? XFASTINT (image) : 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11978 if (ino >= gif->ImageCount) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11979 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11980 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
|
11981 image, img->spec); |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11982 fn_DGifCloseFile (gif); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11983 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11984 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11985 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11986 |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11987 width = img->width = max (gif->SWidth, gif->Image.Left + gif->Image.Width); |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11988 height = img->height = max (gif->SHeight, gif->Image.Top + gif->Image.Height); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11989 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11990 /* Create the X image and pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11991 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
|
11992 { |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
11993 fn_DGifCloseFile (gif); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11994 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11995 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11996 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
11997 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11998 /* Allocate colors. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
11999 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
|
12000 if (!gif_color_map) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12001 gif_color_map = gif->SColorMap; |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
12002 #if 0 /* TODO: Color tables */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12003 init_color_table (); |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
12004 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12005 bzero (pixel_colors, sizeof pixel_colors); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12006 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12007 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
|
12008 { |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
12009 int r = gif_color_map->Colors[i].Red; |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
12010 int g = gif_color_map->Colors[i].Green; |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
12011 int b = gif_color_map->Colors[i].Blue; |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
12012 #if 0 /* TODO: Color tables */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12013 pixel_colors[i] = lookup_rgb_color (f, r, g, b); |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
12014 #else |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
12015 pixel_colors[i] = PALETTERGB (r, g, b); |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
12016 #endif |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
12017 } |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
12018 |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
12019 #if 0 /* TODO: Color tables */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12020 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
|
12021 free_color_table (); |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
12022 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12023 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12024 /* 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
|
12025 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
|
12026 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
|
12027 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
|
12028 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
|
12029 image_top = gif->SavedImages[ino].ImageDesc.Top; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12030 image_left = gif->SavedImages[ino].ImageDesc.Left; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12031 image_width = gif->SavedImages[ino].ImageDesc.Width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12032 image_height = gif->SavedImages[ino].ImageDesc.Height; |
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 for (y = 0; y < image_top; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12035 for (x = 0; x < width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12036 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
|
12037 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12038 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
|
12039 for (x = 0; x < width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12040 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
|
12041 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12042 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
|
12043 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12044 for (x = 0; x < image_left; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12045 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
|
12046 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
|
12047 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
|
12048 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12049 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12050 /* 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
|
12051 `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
|
12052 problems with bytes >= 0x80. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12053 raster = (unsigned char *) gif->SavedImages[ino].RasterBits; |
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 if (gif->SavedImages[ino].ImageDesc.Interlace) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12056 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12057 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
|
12058 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
|
12059 int pass; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12060 int row = interlace_start[0]; |
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 pass = 0; |
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 for (y = 0; y < image_height; y++) |
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 if (row >= image_height) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12067 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12068 row = interlace_start[++pass]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12069 while (row >= image_height) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12070 row = interlace_start[++pass]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12071 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12072 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12073 for (x = 0; x < image_width; x++) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12074 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12075 int i = raster[(y * image_width) + x]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12076 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
|
12077 pixel_colors[i]); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12078 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12079 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12080 row += interlace_increment[pass]; |
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 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12083 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12084 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12085 for (y = 0; y < image_height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12086 for (x = 0; x < image_width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12087 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12088 int i = raster[y* image_width + x]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12089 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
|
12090 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12091 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12092 |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
12093 fn_DGifCloseFile (gif); |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12094 |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12095 /* 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
|
12096 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
|
12097 IMAGE_BACKGROUND (img, f, ximg); |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12098 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12099 /* 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
|
12100 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
|
12101 x_destroy_x_image (ximg); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12102 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12103 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12104 return 1; |
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 #endif /* HAVE_GIF != 0 */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12108 |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12111 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12112 Ghostscript |
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 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12115 Lisp_Object Qpostscript; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12116 |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
12117 /* Keyword symbols. */ |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
12118 |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
12119 Lisp_Object QCloader, QCbounding_box, QCpt_width, QCpt_height; |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
12120 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12121 #ifdef HAVE_GHOSTSCRIPT |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12122 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
|
12123 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
|
12124 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
|
12125 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12126 /* 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
|
12127 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12128 /* Keyword symbols. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12129 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12130 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
|
12131 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12132 /* 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
|
12133 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12134 enum gs_keyword_index |
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 GS_TYPE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12137 GS_PT_WIDTH, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12138 GS_PT_HEIGHT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12139 GS_FILE, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12140 GS_LOADER, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12141 GS_BOUNDING_BOX, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12142 GS_ASCENT, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12143 GS_MARGIN, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12144 GS_RELIEF, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12145 GS_ALGORITHM, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12146 GS_HEURISTIC_MASK, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12147 GS_MASK, |
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12148 GS_BACKGROUND, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12149 GS_LAST |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12152 /* 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
|
12153 of valid user-defined image specifications. */ |
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 struct image_keyword gs_format[GS_LAST] = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12156 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12157 {":type", IMAGE_SYMBOL_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12158 {":pt-width", IMAGE_POSITIVE_INTEGER_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12159 {":pt-height", IMAGE_POSITIVE_INTEGER_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12160 {":file", IMAGE_STRING_VALUE, 1}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12161 {":loader", IMAGE_FUNCTION_VALUE, 0}, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12162 {":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
|
12163 {":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
|
12164 {":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
|
12165 {":relief", IMAGE_INTEGER_VALUE, 0}, |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
12166 {":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
|
12167 {":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
|
12168 {":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
|
12169 {":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
|
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 /* Structure describing the image type `ghostscript'. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12173 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12174 static struct image_type gs_type = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12175 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12176 &Qpostscript, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12177 gs_image_p, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12178 gs_load, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12179 gs_clear_image, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12180 NULL |
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 |
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 /* 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
|
12185 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12186 static void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12187 gs_clear_image (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12188 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12189 struct image *img; |
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 /* 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
|
12192 xfree (img->data.ptr_val); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12193 x_clear_image (f, img); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12194 } |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12197 /* 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
|
12198 specification. */ |
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 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12201 gs_image_p (object) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12202 Lisp_Object object; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12203 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12204 struct image_keyword fmt[GS_LAST]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12205 Lisp_Object tem; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12206 int i; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12207 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12208 bcopy (gs_format, fmt, sizeof fmt); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12209 |
48449
548ef238f24f
(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
Jason Rumney <jasonr@gnu.org>
parents:
48448
diff
changeset
|
12210 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
|
12211 return 0; |
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 /* 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
|
12214 tem = fmt[GS_BOUNDING_BOX].value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12215 if (CONSP (tem)) |
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 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
|
12218 if (!CONSP (tem) || !INTEGERP (XCAR (tem))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12219 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12220 if (!NILP (tem)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12221 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12222 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12223 else if (VECTORP (tem)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12224 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12225 if (XVECTOR (tem)->size != 4) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12226 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12227 for (i = 0; i < 4; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12228 if (!INTEGERP (XVECTOR (tem)->contents[i])) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12229 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12230 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12231 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12232 return 0; |
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 return 1; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12237 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12238 /* 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
|
12239 if successful. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12240 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12241 static int |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12242 gs_load (f, img) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12243 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12244 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12245 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12246 char buffer[100]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12247 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
|
12248 struct gcpro gcpro1, gcpro2; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12249 Lisp_Object frame; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12250 double in_width, in_height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12251 Lisp_Object pixel_colors = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12252 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12253 /* 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
|
12254 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
|
12255 = 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
|
12256 info. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12257 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
|
12258 in_width = XFASTINT (pt_width) / 72.0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12259 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
|
12260 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
|
12261 in_height = XFASTINT (pt_height) / 72.0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12262 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
|
12263 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12264 /* Create the pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12265 BLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12266 xassert (img->pixmap == 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12267 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
|
12268 img->width, img->height, |
41250
4423b32c875c
(x_set_frame_parameters): Avoid infinite recursion for
Jason Rumney <jasonr@gnu.org>
parents:
41132
diff
changeset
|
12269 one_w32_display_info.n_cbits); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12270 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12271 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12272 if (!img->pixmap) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12273 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12274 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
|
12275 return 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12276 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12277 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12278 /* 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
|
12279 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
|
12280 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
|
12281 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
|
12282 GCPRO2 (window_and_pixmap_id, pixel_colors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12283 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12284 sprintf (buffer, "%lu %lu", |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12285 (unsigned long) FRAME_W32_WINDOW (f), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12286 (unsigned long) img->pixmap); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12287 window_and_pixmap_id = build_string (buffer); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12288 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12289 sprintf (buffer, "%lu %lu", |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12290 FRAME_FOREGROUND_PIXEL (f), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12291 FRAME_BACKGROUND_PIXEL (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12292 pixel_colors = build_string (buffer); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12293 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12294 XSETFRAME (frame, f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12295 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
|
12296 if (NILP (loader)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12297 loader = intern ("gs-load-image"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12298 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12299 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
|
12300 make_number (img->width), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12301 make_number (img->height), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12302 window_and_pixmap_id, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12303 pixel_colors); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12304 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12305 return PROCESSP (img->data.lisp_val); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12306 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12307 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12308 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12309 /* 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
|
12310 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
|
12311 telling Emacs that Ghostscript has finished drawing. */ |
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 void |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12314 x_kill_gs_process (pixmap, f) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12315 Pixmap pixmap; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12316 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12317 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12318 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
|
12319 int class, i; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12320 struct image *img; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12321 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12322 /* Find the image containing PIXMAP. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12323 for (i = 0; i < c->used; ++i) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12324 if (c->images[i]->pixmap == pixmap) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12325 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12326 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12327 /* 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
|
12328 instance, give up. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12329 if (i == c->used) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12330 return; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12331 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12332 /* 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
|
12333 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
|
12334 img = c->images[i]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12335 xassert (PROCESSP (img->data.lisp_val)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12336 Fkill_process (img->data.lisp_val, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12337 img->data.lisp_val = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12338 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12339 /* 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
|
12340 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
|
12341 img->pixmap. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12342 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
|
12343 if (class != StaticColor && class != StaticGray && class != TrueColor) |
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 XImage *ximg; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12346 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12347 BLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12348 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12349 /* 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
|
12350 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
|
12351 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
|
12352 if (ximg) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12353 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12354 int x, y; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12355 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12356 /* Initialize the color table. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12357 init_color_table (); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12358 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12359 /* 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
|
12360 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
|
12361 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
|
12362 for (y = 0; y < img->height; ++y) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12363 for (x = 0; x < img->width; ++x) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12364 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12365 unsigned long pixel = XGetPixel (ximg, x, y); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12366 lookup_pixel_color (f, pixel); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12367 } |
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 /* 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
|
12370 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
|
12371 free_color_table (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12372 XDestroyImage (ximg); |
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 #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
|
12375 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
|
12376 freeing the colors. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12377 /* 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
|
12378 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
|
12379 reference counts right, free them once. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12380 if (img->ncolors) |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12381 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
|
12382 img->colors, img->ncolors, 0); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12383 #endif |
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 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12386 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
|
12387 img->spec, Qnil); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12388 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12389 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12390 } |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12391 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12392 /* 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
|
12393 image if requested. */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12394 BLOCK_INPUT; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12395 postprocess_image (f, img); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12396 UNBLOCK_INPUT; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12397 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12398 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12399 #endif /* HAVE_GHOSTSCRIPT */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12400 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12401 |
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 Window properties |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12404 ***********************************************************************/ |
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 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
|
12407 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
|
12408 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
|
12409 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
|
12410 selected frame. Value is VALUE. */) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12411 (prop, value, frame) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12412 Lisp_Object frame, prop, value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12413 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
12414 #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
|
12415 struct frame *f = check_x_frame (frame); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12416 Atom prop_atom; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12417 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
12418 CHECK_STRING (prop); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
12419 CHECK_STRING (value); |
27397
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 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
|
12422 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
|
12423 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
|
12424 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
|
12425 SDATA (value), SCHARS (value)); |
27397
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 /* 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
|
12428 XFlush (FRAME_W32_DISPLAY (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12429 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12430 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
12431 #endif /* TODO */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12432 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12433 return value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12434 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12435 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12436 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12437 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
|
12438 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
|
12439 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
|
12440 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
|
12441 (prop, frame) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12442 Lisp_Object prop, frame; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12443 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
12444 #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
|
12445 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12446 struct frame *f = check_x_frame (frame); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12447 Atom prop_atom; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12448 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
12449 CHECK_STRING (prop); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12450 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
|
12451 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
|
12452 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
|
12453 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12454 /* 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
|
12455 XFlush (FRAME_W32_DISPLAY (f)); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12456 UNBLOCK_INPUT; |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
12457 #endif /* TODO */ |
27397
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 return prop; |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12462 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12463 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
|
12464 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
|
12465 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
|
12466 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
|
12467 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
|
12468 value. */) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12469 (prop, frame) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12470 Lisp_Object prop, frame; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12471 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
12472 #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
|
12473 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12474 struct frame *f = check_x_frame (frame); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12475 Atom prop_atom; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12476 int rc; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12477 Lisp_Object prop_value = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12478 char *tmp_data = NULL; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12479 Atom actual_type; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12480 int actual_format; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12481 unsigned long actual_size, bytes_remaining; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12482 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
12483 CHECK_STRING (prop); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12484 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
|
12485 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
|
12486 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
|
12487 prop_atom, 0, 0, False, XA_STRING, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12488 &actual_type, &actual_format, &actual_size, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12489 &bytes_remaining, (unsigned char **) &tmp_data); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12490 if (rc == Success) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12491 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12492 int size = bytes_remaining; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12493 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12494 XFree (tmp_data); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12495 tmp_data = NULL; |
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 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
|
12498 prop_atom, 0, bytes_remaining, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12499 False, XA_STRING, |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12500 &actual_type, &actual_format, |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12501 &actual_size, &bytes_remaining, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12502 (unsigned char **) &tmp_data); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12503 if (rc == Success) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12504 prop_value = make_string (tmp_data, size); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12505 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12506 XFree (tmp_data); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12507 } |
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 UNBLOCK_INPUT; |
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 return prop_value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12512 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
12513 #endif /* TODO */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12514 return Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12515 } |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12519 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12520 Busy cursor |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12521 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12522 |
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
|
12523 /* 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
|
12524 an hourglass cursor on all frames. */ |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12525 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12526 static struct atimer *hourglass_atimer; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12527 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12528 /* 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
|
12529 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12530 static int hourglass_shown_p; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12531 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12532 /* 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
|
12533 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12534 static Lisp_Object Vhourglass_delay; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12535 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12536 /* 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
|
12537 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
|
12538 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12539 #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
|
12540 |
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
|
12541 /* 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
|
12542 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12543 static void show_hourglass P_ ((struct atimer *)); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12544 static void hide_hourglass P_ ((void)); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12545 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12546 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12547 /* 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
|
12548 |
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
|
12549 void |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12550 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
|
12551 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
12552 #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
|
12553 EMACS_TIME delay; |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
12554 int secs, usecs = 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12555 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12556 cancel_hourglass (); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12557 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12558 if (INTEGERP (Vhourglass_delay) |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12559 && XINT (Vhourglass_delay) > 0) |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12560 secs = XFASTINT (Vhourglass_delay); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12561 else if (FLOATP (Vhourglass_delay) |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12562 && 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
|
12563 { |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
12564 Lisp_Object tem; |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12565 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
|
12566 secs = XFASTINT (tem); |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12567 usecs = (XFLOAT_DATA (Vhourglass_delay) - secs) * 1000000; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12568 } |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12569 else |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12570 secs = DEFAULT_HOURGLASS_DELAY; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12571 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
12572 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
|
12573 hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay, |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12574 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
|
12575 #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
|
12576 } |
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
|
12577 |
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
|
12578 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12579 /* 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
|
12580 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
|
12581 |
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
|
12582 void |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12583 cancel_hourglass () |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12584 { |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12585 if (hourglass_atimer) |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12586 { |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12587 cancel_atimer (hourglass_atimer); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12588 hourglass_atimer = NULL; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12589 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12590 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12591 if (hourglass_shown_p) |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12592 hide_hourglass (); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12593 } |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12594 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12595 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12596 /* 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
|
12597 hourglass_atimer. |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12598 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12599 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
|
12600 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
|
12601 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
|
12602 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
|
12603 |
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
|
12604 static void |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12605 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
|
12606 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
|
12607 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
12608 #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
|
12609 /* 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
|
12610 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
|
12611 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
|
12612 hourglass_atimer = NULL; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12613 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12614 if (!hourglass_shown_p) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12615 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12616 Lisp_Object rest, frame; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12617 |
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
|
12618 BLOCK_INPUT; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12619 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12620 FOR_EACH_FRAME (rest, frame) |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
12621 if (FRAME_W32_P (XFRAME (frame))) |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12622 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12623 struct frame *f = XFRAME (frame); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12624 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12625 f->output_data.w32->hourglass_p = 1; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12626 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12627 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
|
12628 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12629 unsigned long mask = CWCursor; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12630 XSetWindowAttributes attrs; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12631 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12632 attrs.cursor = f->output_data.w32->hourglass_cursor; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12633 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12634 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
|
12635 = XCreateWindow (FRAME_X_DISPLAY (f), |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12636 FRAME_OUTER_WINDOW (f), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12637 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
|
12638 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
|
12639 CopyFromParent, |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12640 mask, &attrs); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12641 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12642 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12643 XMapRaised (FRAME_X_DISPLAY (f), |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12644 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
|
12645 XFlush (FRAME_X_DISPLAY (f)); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12646 } |
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
|
12647 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12648 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
|
12649 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
|
12650 } |
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
|
12651 #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
|
12652 } |
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
|
12653 |
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
|
12654 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12655 /* 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
|
12656 |
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
|
12657 static void |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12658 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
|
12659 { |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
12660 #if 0 /* TODO: cursor shape changes. */ |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12661 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
|
12662 { |
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
|
12663 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
|
12664 |
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
|
12665 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
|
12666 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
|
12667 { |
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
|
12668 struct frame *f = XFRAME (frame); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12669 |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
12670 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
|
12671 /* Watch out for newly created frames. */ |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12672 && 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
|
12673 { |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12674 XUnmapWindow (FRAME_X_DISPLAY (f), |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12675 f->output_data.x->hourglass_window); |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12676 /* 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
|
12677 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
|
12678 XSync (FRAME_X_DISPLAY (f), False); |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12679 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
|
12680 } |
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
|
12681 } |
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
|
12682 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
12683 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
|
12684 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
|
12685 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12686 #endif |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12689 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12690 |
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 Tool tips |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12695 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
|
12696 Lisp_Object, Lisp_Object)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12697 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
|
12698 Lisp_Object, int, int, int *, int *)); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12699 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12700 /* 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
|
12701 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
12702 Lisp_Object tip_frame; |
27397
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 /* 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
|
12705 fires. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12706 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12707 Lisp_Object tip_timer; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12708 Window tip_window; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12709 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12710 /* 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
|
12711 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
|
12712 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12713 Lisp_Object last_show_tip_args; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12714 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12715 /* 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
|
12716 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12717 Lisp_Object Vx_max_tooltip_size; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12718 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12719 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
12720 static Lisp_Object |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
12721 unwind_create_tip_frame (frame) |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
12722 Lisp_Object frame; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
12723 { |
34638
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
12724 Lisp_Object deleted; |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
12725 |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
12726 deleted = unwind_create_frame (frame); |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
12727 if (EQ (deleted, Qt)) |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
12728 { |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
12729 tip_window = NULL; |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
12730 tip_frame = Qnil; |
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
12731 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12732 |
34638
abb4510a89f6
(unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents:
34546
diff
changeset
|
12733 return deleted; |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
12734 } |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
12735 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
12736 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12737 /* 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
|
12738 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
|
12739 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
|
12740 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
12741 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
|
12742 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
|
12743 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
|
12744 when this happens. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12745 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12746 static Lisp_Object |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12747 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
|
12748 struct w32_display_info *dpyinfo; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12749 Lisp_Object parms, text; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12750 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12751 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12752 Lisp_Object frame, tem; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12753 Lisp_Object name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12754 long window_prompting = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12755 int width, height; |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46272
diff
changeset
|
12756 int count = SPECPDL_INDEX (); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12757 struct gcpro gcpro1, gcpro2, gcpro3; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12758 struct kboard *kb; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12759 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
|
12760 Lisp_Object buffer; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12761 struct buffer *old_buffer; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12762 |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
12763 check_w32 (); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12764 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12765 /* 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
|
12766 this frame has a specified name. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12767 Vx_resource_name = Vinvocation_name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12768 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12769 #ifdef MULTI_KBOARD |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12770 kb = dpyinfo->kboard; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12771 #else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12772 kb = &the_only_kboard; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12773 #endif |
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 /* 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
|
12776 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
|
12777 if (!STRINGP (name) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12778 && !EQ (name, Qunbound) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12779 && !NILP (name)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12780 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
|
12781 Vx_resource_name = name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12782 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12783 frame = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12784 GCPRO3 (parms, name, frame); |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
12785 /* 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
|
12786 f = make_frame (0); |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
12787 f->wants_modeline = 0; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12788 XSETFRAME (frame, f); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12789 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12790 buffer = Fget_buffer_create (build_string (" *tip*")); |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
12791 Fset_window_buffer (FRAME_ROOT_WINDOW (f), buffer, Qnil); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12792 old_buffer = current_buffer; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12793 set_buffer_internal_1 (XBUFFER (buffer)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12794 current_buffer->truncate_lines = Qnil; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12795 Ferase_buffer (); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12796 Finsert (1, &text); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12797 set_buffer_internal_1 (old_buffer); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12798 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12799 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
|
12800 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
|
12801 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12802 /* 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
|
12803 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
|
12804 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
|
12805 counts etc. */ |
27516
8001542eaee2
(w32_defined_color): Check for valid frame before
Jason Rumney <jasonr@gnu.org>
parents:
27407
diff
changeset
|
12806 f->output_method = output_w32; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12807 f->output_data.w32 = |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12808 (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
|
12809 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
|
12810 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
12811 FRAME_FONTSET (f) = -1; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12812 f->icon_name = Qnil; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12813 |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
12814 #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
|
12815 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
|
12816 dpyinfo_refcount = dpyinfo->reference_count; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
12817 #endif /* GLYPH_DEBUG */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12818 #ifdef MULTI_KBOARD |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12819 FRAME_KBOARD (f) = kb; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12820 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12821 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
|
12822 f->output_data.w32->explicit_parent = 0; |
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 /* 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
|
12825 be set. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12826 if (EQ (name, Qunbound) || NILP (name)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12827 { |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
12828 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
|
12829 f->explicit_name = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12830 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12831 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12832 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12833 f->name = name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12834 f->explicit_name = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12835 /* 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
|
12836 specbind (Qx_resource_name, name); |
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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12839 /* 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
|
12840 that are needed to determine window geometry. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12841 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12842 Lisp_Object font; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12843 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12844 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
|
12845 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12846 BLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12847 /* 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
|
12848 if (STRINGP (font)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12849 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12850 tem = Fquery_fontset (font, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12851 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
|
12852 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
|
12853 else |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
12854 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
|
12855 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12856 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12857 /* 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
|
12858 if (!STRINGP (font)) |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
12859 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
|
12860 if (! STRINGP (font)) |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
12861 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
|
12862 /* 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
|
12863 if (! STRINGP (font)) |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
12864 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
|
12865 UNBLOCK_INPUT; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12866 if (! STRINGP (font)) |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
12867 font = build_string ("Fixedsys"); |
27397
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 x_default_parameter (f, parms, Qfont, font, |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12870 "font", "Font", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12871 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12872 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12873 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
|
12874 "borderWidth", "BorderWidth", RES_TYPE_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12875 /* 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
|
12876 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
|
12877 it). */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12878 if (NILP (Fassq (Qinternal_border_width, parms))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12879 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12880 Lisp_Object value; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12881 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12882 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
|
12883 "internalBorder", "internalBorder", RES_TYPE_NUMBER); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12884 if (! EQ (value, Qunbound)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12885 parms = Fcons (Fcons (Qinternal_border_width, value), |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12886 parms); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12887 } |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
12888 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
|
12889 "internalBorderWidth", "internalBorderWidth", |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12890 RES_TYPE_NUMBER); |
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 /* 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
|
12893 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
|
12894 "foreground", "Foreground", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12895 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
|
12896 "background", "Background", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12897 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
|
12898 "pointerColor", "Foreground", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12899 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
|
12900 "cursorColor", "Foreground", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12901 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
|
12902 "borderColor", "BorderColor", RES_TYPE_STRING); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12903 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12904 /* 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
|
12905 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
|
12906 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
|
12907 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
|
12908 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
|
12909 happen. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12910 init_frame_faces (f); |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
12911 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
12912 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
|
12913 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
|
12914 |
50362
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
12915 window_prompting = x_figure_window_size (f, parms, 0); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12916 |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
12917 /* No fringes on tip frame. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
12918 f->fringe_cols = 0; |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
12919 f->left_fringe_width = 0; |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
12920 f->right_fringe_width = 0; |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
12921 |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
12922 BLOCK_INPUT; |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
12923 my_create_tip_window (f); |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
12924 UNBLOCK_INPUT; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12925 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12926 x_make_gc (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12927 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12928 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
|
12929 "autoRaise", "AutoRaiseLower", RES_TYPE_BOOLEAN); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12930 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
|
12931 "autoLower", "AutoRaiseLower", RES_TYPE_BOOLEAN); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12932 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
|
12933 "cursorType", "CursorType", RES_TYPE_SYMBOL); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12934 |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
12935 /* Dimensions, especially FRAME_LINES (f), must be done via change_frame_size. |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12936 Change will not be effected unless different from the current |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
12937 FRAME_LINES (f). */ |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
12938 width = FRAME_COLS (f); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
12939 height = FRAME_LINES (f); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
12940 FRAME_LINES (f) = 0; |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
12941 SET_FRAME_COLS (f, 0); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12942 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
|
12943 |
47731
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47161
diff
changeset
|
12944 /* 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
|
12945 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
|
12946 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
|
12947 Qnil)); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12948 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12949 /* 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
|
12950 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
|
12951 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12952 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
|
12953 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
|
12954 `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
|
12955 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
|
12956 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
|
12957 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12958 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
|
12959 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12960 /* Set tip_frame here, so that */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12961 tip_frame = frame; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12962 call1 (Qface_set_after_frame_default, frame); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12963 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12964 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
|
12965 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
|
12966 Qnil)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12967 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
12968 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12969 f->no_split = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12970 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12971 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12972 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12973 /* 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
|
12974 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
|
12975 visible won't work. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12976 Vframe_list = Fcons (frame, Vframe_list); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12977 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12978 /* 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
|
12979 its display. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12980 FRAME_W32_DISPLAY_INFO (f)->reference_count++; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12981 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12982 /* 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
|
12983 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
|
12984 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
|
12985 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
|
12986 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
|
12987 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
|
12988 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12989 /* Discard the unwind_protect. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12990 return unbind_to (count, frame); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12991 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
12992 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12993 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
12994 /* 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
|
12995 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
|
12996 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
|
12997 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
|
12998 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
|
12999 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13000 static void |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13001 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
|
13002 struct frame *f; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13003 Lisp_Object parms, dx, dy; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13004 int width, height; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13005 int *root_x, *root_y; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13006 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13007 Lisp_Object left, top; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13008 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13009 /* User-specified position? */ |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13010 left = Fcdr (Fassq (Qleft, parms)); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13011 top = Fcdr (Fassq (Qtop, parms)); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13012 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13013 /* 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
|
13014 show it. */ |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13015 if (!INTEGERP (left) || !INTEGERP (top)) |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13016 { |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13017 POINT pt; |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13018 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13019 BLOCK_INPUT; |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13020 GetCursorPos (&pt); |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13021 *root_x = pt.x; |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13022 *root_y = pt.y; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13023 UNBLOCK_INPUT; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13024 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13025 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13026 if (INTEGERP (top)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13027 *root_y = XINT (top); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13028 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
|
13029 *root_y -= XINT (dy); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13030 else |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13031 { |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13032 *root_y -= height; |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13033 *root_y += XINT (dy); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13034 } |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13035 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13036 if (INTEGERP (left)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13037 *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
|
13038 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
|
13039 /* 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
|
13040 *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
|
13041 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
|
13042 /* 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
|
13043 *root_x -= width + XINT (dx); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13044 else |
42537
f0e15bcba768
(compute_tip_xy): If tooltip won't fit on the screen
Jason Rumney <jasonr@gnu.org>
parents:
42007
diff
changeset
|
13045 /* 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
|
13046 *root_x = 0; |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13047 } |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13048 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13049 |
31110 | 13050 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
|
13051 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
|
13052 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
|
13053 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13054 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
|
13055 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13056 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
|
13057 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
|
13058 |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13059 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
|
13060 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
|
13061 |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13062 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
|
13063 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
|
13064 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
|
13065 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
|
13066 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
|
13067 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
|
13068 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
|
13069 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13070 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
|
13071 Text larger than the specified size is clipped. */) |
31110 | 13072 (string, frame, parms, timeout, dx, dy) |
13073 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
|
13074 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13075 struct frame *f; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13076 struct window *w; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13077 int root_x, root_y; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13078 struct buffer *old_buffer; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13079 struct text_pos pos; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13080 int i, width, height; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13081 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13082 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
|
13083 int count = SPECPDL_INDEX (); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13084 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13085 specbind (Qinhibit_redisplay, Qt); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13086 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
13087 GCPRO4 (string, parms, frame, timeout); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13088 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
13089 CHECK_STRING (string); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13090 f = check_x_frame (frame); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13091 if (NILP (timeout)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13092 timeout = make_number (5); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13093 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
13094 CHECK_NATNUM (timeout); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13095 |
31110 | 13096 if (NILP (dx)) |
13097 dx = make_number (5); | |
13098 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
13099 CHECK_NUMBER (dx); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13100 |
31110 | 13101 if (NILP (dy)) |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13102 dy = make_number (-10); |
31110 | 13103 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
13104 CHECK_NUMBER (dy); |
31110 | 13105 |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13106 if (NILP (last_show_tip_args)) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13107 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
|
13108 |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13109 if (!NILP (tip_frame)) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13110 { |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13111 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
|
13112 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
|
13113 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
|
13114 |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13115 if (EQ (frame, last_frame) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13116 && !NILP (Fequal (last_string, string)) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13117 && !NILP (Fequal (last_parms, parms))) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13118 { |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13119 struct frame *f = XFRAME (tip_frame); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13120 |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13121 /* Only DX and DY have changed. */ |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13122 if (!NILP (tip_timer)) |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13123 { |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13124 Lisp_Object timer = tip_timer; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13125 tip_timer = Qnil; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13126 call1 (Qcancel_timer, timer); |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13127 } |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13128 |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13129 BLOCK_INPUT; |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
13130 compute_tip_xy (f, parms, dx, dy, FRAME_PIXEL_WIDTH (f), |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
13131 FRAME_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
|
13132 |
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
13133 /* 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
|
13134 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
|
13135 root_x, root_y, 0, 0, |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13136 SWP_NOSIZE | SWP_NOACTIVATE); |
43210
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
13137 |
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
13138 /* 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
|
13139 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
|
13140 0, 0, 0, 0, |
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
13141 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
|
13142 |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13143 UNBLOCK_INPUT; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13144 goto start_timer; |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13145 } |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13146 } |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13147 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13148 /* Hide a previous tip, if any. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13149 Fx_hide_tip (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13150 |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13151 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
|
13152 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
|
13153 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
|
13154 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13155 /* Add default values to frame parameters. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13156 if (NILP (Fassq (Qname, parms))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13157 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
|
13158 if (NILP (Fassq (Qinternal_border_width, parms))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13159 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
|
13160 if (NILP (Fassq (Qborder_width, parms))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13161 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
|
13162 if (NILP (Fassq (Qborder_color, parms))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13163 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
|
13164 if (NILP (Fassq (Qbackground_color, parms))) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13165 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
|
13166 parms); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13167 |
41480
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
13168 /* 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
|
13169 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
|
13170 BLOCK_INPUT; |
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
13171 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13172 /* 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
|
13173 variable tip_frame. */ |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13174 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
|
13175 f = XFRAME (frame); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13176 |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13177 /* 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
|
13178 w = XWINDOW (FRAME_ROOT_WINDOW (f)); |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
13179 w->left_col = w->top_line = make_number (0); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13180 |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13181 if (CONSP (Vx_max_tooltip_size) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13182 && INTEGERP (XCAR (Vx_max_tooltip_size)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13183 && 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
|
13184 && INTEGERP (XCDR (Vx_max_tooltip_size)) |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13185 && 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
|
13186 { |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
13187 w->total_cols = XCAR (Vx_max_tooltip_size); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
13188 w->total_lines = XCDR (Vx_max_tooltip_size); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
13189 } |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
13190 else |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
13191 { |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
13192 w->total_cols = make_number (80); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
13193 w->total_lines = make_number (40); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
13194 } |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
13195 |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50377
diff
changeset
|
13196 FRAME_TOTAL_COLS (f) = XINT (w->total_cols); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13197 adjust_glyphs (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13198 w->pseudo_window_p = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13199 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13200 /* 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
|
13201 old_buffer = current_buffer; |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13202 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
|
13203 current_buffer->truncate_lines = Qnil; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13204 clear_glyph_matrix (w->desired_matrix); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13205 clear_glyph_matrix (w->current_matrix); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13206 SET_TEXT_POS (pos, BEGV, BEGV_BYTE); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13207 try_window (FRAME_ROOT_WINDOW (f), pos); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13208 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13209 /* Compute width and height of the tooltip. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13210 width = height = 0; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13211 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
|
13212 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13213 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
|
13214 struct glyph *last; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13215 int row_width; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13216 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13217 /* 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
|
13218 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
|
13219 break; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13220 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13221 /* 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
|
13222 row->full_width_p = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13223 |
41638
aadcf676d5de
(w32_wnd_proc) <WM_MENUSELECT>: Display help directly.
Jason Rumney <jasonr@gnu.org>
parents:
41480
diff
changeset
|
13224 #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
|
13225 calculated for some tooltips. */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13226 /* 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
|
13227 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
|
13228 if (row->used[TEXT_AREA]) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13229 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13230 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
|
13231 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
|
13232 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13233 else |
41638
aadcf676d5de
(w32_wnd_proc) <WM_MENUSELECT>: Display help directly.
Jason Rumney <jasonr@gnu.org>
parents:
41480
diff
changeset
|
13234 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13235 row_width = row->pixel_width; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13236 |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
13237 /* 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
|
13238 height += row->height; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13239 width = max (width, row_width); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13240 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13241 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13242 /* 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
|
13243 window should have. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13244 height += 2 * FRAME_INTERNAL_BORDER_WIDTH (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13245 width += 2 * FRAME_INTERNAL_BORDER_WIDTH (f); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13246 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13247 /* 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
|
13248 show it. */ |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
13249 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
|
13250 |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
13251 { |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
13252 /* 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
|
13253 RECT rect; |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
13254 rect.left = rect.top = 0; |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
13255 rect.right = width; |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
13256 rect.bottom = height; |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
13257 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
|
13258 FRAME_EXTERNAL_MENU_BAR (f)); |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
13259 |
43210
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
13260 /* 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
|
13261 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
|
13262 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
|
13263 rect.bottom - rect.top, SWP_NOACTIVATE); |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
13264 |
43210
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
13265 /* 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
|
13266 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
|
13267 0, 0, 0, 0, |
3df71b933c36
(w32_load_system_font): Prevent Cleartype fonts from loading.
Jason Rumney <jasonr@gnu.org>
parents:
43207
diff
changeset
|
13268 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
|
13269 |
41448
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
13270 /* 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
|
13271 f->async_visible = 1; |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
13272 |
96beda35d0fa
(w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
Jason Rumney <jasonr@gnu.org>
parents:
41380
diff
changeset
|
13273 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
|
13274 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13275 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13276 /* Draw into the window. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13277 w->must_be_updated_p = 1; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13278 update_single_window (w, 1); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13279 |
41480
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
13280 UNBLOCK_INPUT; |
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
13281 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13282 /* Restore original current buffer. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13283 set_buffer_internal_1 (old_buffer); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13284 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
|
13285 |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13286 start_timer: |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13287 /* Let the tip disappear after timeout seconds. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13288 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
|
13289 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
|
13290 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13291 UNGCPRO; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13292 return unbind_to (count, 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 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13295 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13296 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
|
13297 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
|
13298 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
|
13299 () |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13300 { |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13301 int count; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13302 Lisp_Object deleted, frame, timer; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13303 struct gcpro gcpro1, gcpro2; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13304 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13305 /* 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
|
13306 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
|
13307 return Qnil; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13308 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13309 frame = tip_frame; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13310 timer = tip_timer; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13311 GCPRO2 (frame, timer); |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13312 tip_frame = tip_timer = deleted = Qnil; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13313 |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46272
diff
changeset
|
13314 count = SPECPDL_INDEX (); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13315 specbind (Qinhibit_redisplay, Qt); |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13316 specbind (Qinhibit_quit, Qt); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
13317 |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13318 if (!NILP (timer)) |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13319 call1 (Qcancel_timer, timer); |
34546
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13320 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13321 if (FRAMEP (frame)) |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13322 { |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13323 Fdelete_frame (frame, Qnil); |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13324 deleted = Qt; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13325 } |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13326 |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13327 UNGCPRO; |
51be06b616bf
(Fx_hide_tip): Avoid unnecessary work when there's
Andrew Innes <andrewi@gnu.org>
parents:
34314
diff
changeset
|
13328 return unbind_to (count, deleted); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13329 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13330 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13331 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13332 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13333 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13334 File selection dialog |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13335 ***********************************************************************/ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13336 extern Lisp_Object Qfile_name_history; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13337 |
45963
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13338 /* 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
|
13339 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
|
13340 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
|
13341 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
|
13342 dialog does not support directories. */ |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13343 UINT CALLBACK |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13344 file_dialog_callback (hwnd, msg, wParam, lParam) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13345 HWND hwnd; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13346 UINT msg; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13347 WPARAM wParam; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13348 LPARAM lParam; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13349 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13350 if (msg == WM_NOTIFY) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13351 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13352 OFNOTIFY * notify = (OFNOTIFY *)lParam; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13353 /* Detect when the Filter dropdown is changed. */ |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13354 if (notify->hdr.code == CDN_TYPECHANGE) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13355 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13356 HWND dialog = GetParent (hwnd); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13357 HWND edit_control = GetDlgItem (dialog, FILE_NAME_TEXT_FIELD); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13358 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13359 /* Directories is in index 2. */ |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13360 if (notify->lpOFN->nFilterIndex == 2) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13361 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13362 CommDlg_OpenSave_SetControlText (dialog, FILE_NAME_TEXT_FIELD, |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13363 "Current Directory"); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13364 EnableWindow (edit_control, FALSE); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13365 } |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13366 else |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13367 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13368 CommDlg_OpenSave_SetControlText (dialog, FILE_NAME_TEXT_FIELD, |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13369 ""); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13370 EnableWindow (edit_control, TRUE); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13371 } |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13372 } |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13373 } |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13374 return 0; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13375 } |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13376 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13377 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
|
13378 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
|
13379 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
|
13380 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
|
13381 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
|
13382 (prompt, dir, default_filename, mustmatch) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13383 Lisp_Object prompt, dir, default_filename, mustmatch; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13384 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13385 struct frame *f = SELECTED_FRAME (); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13386 Lisp_Object file = Qnil; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46285
diff
changeset
|
13387 int count = SPECPDL_INDEX (); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13388 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13389 char filename[MAX_PATH + 1]; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13390 char init_dir[MAX_PATH + 1]; |
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 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
|
13393 CHECK_STRING (prompt); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
13394 CHECK_STRING (dir); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13395 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13396 /* 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
|
13397 directory and using "*" as pattern. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13398 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
|
13399 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
|
13400 init_dir[MAX_PATH] = '\0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13401 unixtodos_filename (init_dir); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13402 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13403 if (STRINGP (default_filename)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13404 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13405 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
|
13406 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
|
13407 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13408 unixtodos_filename (full_path_name); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13409 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13410 file_name_only = strrchr (full_path_name, '\\'); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13411 if (!file_name_only) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13412 file_name_only = full_path_name; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13413 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13414 { |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13415 file_name_only++; |
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 strncpy (filename, file_name_only, MAX_PATH); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13419 filename[MAX_PATH] = '\0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13420 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13421 else |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13422 filename[0] = '\0'; |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13423 |
45963
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13424 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13425 OPENFILENAME file_details; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13426 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13427 /* Prevent redisplay. */ |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13428 specbind (Qinhibit_redisplay, Qt); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13429 BLOCK_INPUT; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13430 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13431 bzero (&file_details, sizeof (file_details)); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13432 file_details.lStructSize = sizeof (file_details); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13433 file_details.hwndOwner = FRAME_W32_WINDOW (f); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13434 /* Undocumented Bug in Common File Dialog: |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13435 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
|
13436 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
|
13437 file_details.lpstrFile = filename; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13438 file_details.nMaxFile = sizeof (filename); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13439 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
|
13440 file_details.lpstrTitle = SDATA (prompt); |
45963
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13441 file_details.Flags = (OFN_HIDEREADONLY | OFN_NOCHANGEDIR |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13442 | OFN_EXPLORER | OFN_ENABLEHOOK); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13443 if (!NILP (mustmatch)) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13444 file_details.Flags |= OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13445 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13446 file_details.lpfnHook = (LPOFNHOOKPROC) file_dialog_callback; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13447 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13448 if (GetOpenFileName (&file_details)) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13449 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13450 dostounix_filename (filename); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13451 if (file_details.nFilterIndex == 2) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13452 { |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13453 /* "Folder Only" selected - strip dummy file name. */ |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13454 char * last = strrchr (filename, '/'); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13455 *last = '\0'; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13456 } |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13457 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13458 file = DECODE_FILE(build_string (filename)); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13459 } |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13460 /* User cancelled the dialog without making a selection. */ |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13461 else if (!CommDlgExtendedError ()) |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13462 file = Qnil; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13463 /* 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
|
13464 else |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13465 file = Fcompleting_read (prompt, intern ("read-file-name-internal"), |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13466 dir, mustmatch, dir, Qfile_name_history, |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13467 default_filename, Qnil); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13468 |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13469 UNBLOCK_INPUT; |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13470 file = unbind_to (count, file); |
e4d2d8c8186f
(file_dialog_callback): New function.
Jason Rumney <jasonr@gnu.org>
parents:
45465
diff
changeset
|
13471 } |
27397
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 UNGCPRO; |
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 /* Make "Cancel" equivalent to C-g. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13476 if (NILP (file)) |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13477 Fsignal (Qquit, Qnil); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13478 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
13479 return unbind_to (count, file); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13480 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13481 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13482 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13483 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13484 /*********************************************************************** |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13485 w32 specialized functions |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13486 ***********************************************************************/ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
13487 |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
13488 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
|
13489 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
|
13490 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
|
13491 (frame, include_proportional) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
13492 Lisp_Object frame, include_proportional; |
13434 | 13493 { |
13494 FRAME_PTR f = check_x_frame (frame); | |
13495 CHOOSEFONT cf; | |
13496 LOGFONT lf; | |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
13497 TEXTMETRIC tm; |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
13498 HDC hdc; |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
13499 HANDLE oldobj; |
13434 | 13500 char buf[100]; |
13501 | |
13502 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
|
13503 bzero (&lf, sizeof (lf)); |
13434 | 13504 |
13505 cf.lStructSize = sizeof (cf); | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
13506 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
|
13507 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
|
13508 |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
13509 /* 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
|
13510 monospaced fonts. */ |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
13511 if (NILP (include_proportional)) |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
13512 cf.Flags |= CF_FIXEDPITCHONLY; |
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
13513 |
13434 | 13514 cf.lpLogFont = &lf; |
13515 | |
24497
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
13516 /* 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
|
13517 default font. */ |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
13518 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
|
13519 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
|
13520 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
|
13521 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
|
13522 { |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
13523 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
|
13524 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
|
13525 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
|
13526 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
|
13527 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
|
13528 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
|
13529 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
|
13530 } |
b09ceba3d319
(enum_font_cb2): Set the font height to be the
Geoff Voelker <voelker@cs.washington.edu>
parents:
24481
diff
changeset
|
13531 SelectObject (hdc, oldobj); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13532 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
|
13533 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
13534 if (!ChooseFont (&cf) || !w32_to_x_font (&lf, buf, 100, NULL)) |
14353 | 13535 return Qnil; |
13434 | 13536 |
13537 return build_string (buf); | |
13538 } | |
13539 | |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13540 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
|
13541 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
|
13542 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
|
13543 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
|
13544 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
|
13545 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
|
13546 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
|
13547 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13548 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
|
13549 (command, frame) |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
13550 Lisp_Object command, frame; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
13551 { |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
13552 FRAME_PTR f = check_x_frame (frame); |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
13553 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
13554 CHECK_NUMBER (command); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
13555 |
24718
547f54dfbb94
(x_to_w32_charset): Reinstall VIETNAMESE_CHARSET
Andrew Innes <andrewi@gnu.org>
parents:
24695
diff
changeset
|
13556 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
|
13557 |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
13558 return Qnil; |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
13559 } |
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
13560 |
24670 | 13561 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
|
13562 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
|
13563 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
|
13564 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
|
13565 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
|
13566 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
|
13567 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
|
13568 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
|
13569 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13570 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
|
13571 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
|
13572 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13573 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
|
13574 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
|
13575 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
|
13576 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13577 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
|
13578 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
|
13579 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
|
13580 6 - start minimized */) |
24670 | 13581 (operation, document, parameters, show_flag) |
13582 Lisp_Object operation, document, parameters, show_flag; | |
13583 { | |
13584 Lisp_Object current_dir; | |
13585 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
13586 CHECK_STRING (document); |
24670 | 13587 |
13588 /* Encode filename and current directory. */ | |
13589 current_dir = ENCODE_FILE (current_buffer->directory); | |
13590 document = ENCODE_FILE (document); | |
13591 if ((int) ShellExecute (NULL, | |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
13592 (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
|
13593 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
|
13594 SDATA (document), |
24670 | 13595 (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
|
13596 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
|
13597 SDATA (current_dir), |
24670 | 13598 (INTEGERP (show_flag) ? |
13599 XINT (show_flag) : SW_SHOWDEFAULT)) | |
13600 > 32) | |
13601 return Qt; | |
34698
cc62e2e0949d
(Fw32_shell_execute): Use it.
Andrew Innes <andrewi@gnu.org>
parents:
34643
diff
changeset
|
13602 error ("ShellExecute failed: %s", w32_strerror (0)); |
24670 | 13603 } |
13604 | |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13605 /* 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
|
13606 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
|
13607 lispy_function_keys. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13608 static int |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13609 lookup_vk_code (char *key) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13610 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13611 int i; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13612 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13613 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
|
13614 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
|
13615 && 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
|
13616 return i; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13617 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13618 return -1; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13619 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13620 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13621 /* 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
|
13622 definition. */ |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13623 static int |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13624 w32_parse_hot_key (key) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13625 Lisp_Object key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13626 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13627 /* 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
|
13628 register Lisp_Object c; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13629 int vk_code; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13630 int lisp_modifiers; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13631 int w32_modifiers; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13632 struct gcpro gcpro1; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13633 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
13634 CHECK_VECTOR (key); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13635 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13636 if (XFASTINT (Flength (key)) != 1) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13637 return Qnil; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13638 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13639 GCPRO1 (key); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13640 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13641 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
|
13642 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13643 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
|
13644 c = Fevent_convert_list (c); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13645 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13646 UNGCPRO; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13647 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13648 if (! INTEGERP (c) && ! SYMBOLP (c)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13649 error ("Key definition is invalid"); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13650 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13651 /* 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
|
13652 if (SYMBOLP (c)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13653 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13654 c = parse_modifiers (c); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13655 lisp_modifiers = Fcar (Fcdr (c)); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13656 c = Fcar (c); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13657 if (!SYMBOLP (c)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13658 abort (); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
13659 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
|
13660 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13661 else if (INTEGERP (c)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13662 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13663 lisp_modifiers = XINT (c) & ~CHARACTERBITS; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13664 /* 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
|
13665 vk_code = XINT (c) & CHARACTERBITS; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13666 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13667 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13668 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
|
13669 return Qnil; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13670 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13671 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
|
13672 && !NILP (Vw32_alt_is_meta)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13673 lisp_modifiers |= alt_modifier; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13674 |
31110 | 13675 /* Supply defs missing from mingw32. */ |
13676 #ifndef MOD_ALT | |
13677 #define MOD_ALT 0x0001 | |
13678 #define MOD_CONTROL 0x0002 | |
13679 #define MOD_SHIFT 0x0004 | |
13680 #define MOD_WIN 0x0008 | |
13681 #endif | |
13682 | |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13683 /* 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
|
13684 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
|
13685 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
|
13686 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
|
13687 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
|
13688 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13689 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
|
13690 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13691 |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13692 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
|
13693 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
|
13694 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
|
13695 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
|
13696 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
|
13697 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
|
13698 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
|
13699 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13700 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
|
13701 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
|
13702 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
|
13703 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
|
13704 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13705 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
|
13706 (key) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13707 Lisp_Object key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13708 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13709 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
|
13710 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13711 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
|
13712 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13713 /* 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
|
13714 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
|
13715 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13716 /* 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
|
13717 if (NILP (item)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13718 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
|
13719 else |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39812
diff
changeset
|
13720 XSETCAR (item, key); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13721 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13722 /* 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
|
13723 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
|
13724 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
|
13725 (WPARAM) key, 0); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13726 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13727 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13728 return key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13729 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13730 |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13731 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
|
13732 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
|
13733 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
|
13734 (key) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13735 Lisp_Object key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13736 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13737 Lisp_Object item; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13738 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13739 if (!INTEGERP (key)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13740 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
|
13741 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13742 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
|
13743 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13744 if (!NILP (item)) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13745 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13746 /* 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
|
13747 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
|
13748 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
|
13749 (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
|
13750 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13751 MSG msg; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13752 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
|
13753 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13754 return Qt; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13755 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13756 return Qnil; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13757 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13758 |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13759 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
|
13760 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
|
13761 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
|
13762 () |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13763 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13764 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
|
13765 } |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13766 |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13767 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
|
13768 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
|
13769 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
|
13770 (hotkeyid) |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13771 Lisp_Object hotkeyid; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13772 { |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13773 int vk_code, w32_modifiers; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13774 Lisp_Object key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13775 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
13776 CHECK_NUMBER (hotkeyid); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13777 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13778 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
|
13779 w32_modifiers = HOTKEY_MODIFIERS (hotkeyid); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13780 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13781 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
|
13782 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
|
13783 else |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13784 key = make_number (vk_code); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13785 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13786 key = Fcons (key, Qnil); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13787 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
|
13788 key = Fcons (Qshift, key); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13789 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
|
13790 key = Fcons (Qctrl, key); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13791 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
|
13792 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
|
13793 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
|
13794 key = Fcons (Qhyper, key); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13795 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13796 return key; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
13797 } |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13798 |
40964
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
13799 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
|
13800 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
|
13801 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
|
13802 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
|
13803 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
|
13804 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
|
13805 (key, new_state) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13806 Lisp_Object key, new_state; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13807 { |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13808 int vk_code; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13809 |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13810 if (EQ (key, intern ("capslock"))) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13811 vk_code = VK_CAPITAL; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13812 else if (EQ (key, intern ("kp-numlock"))) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13813 vk_code = VK_NUMLOCK; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13814 else if (EQ (key, intern ("scroll"))) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13815 vk_code = VK_SCROLL; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13816 else |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13817 return Qnil; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13818 |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13819 if (!dwWindowsThreadId) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13820 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
|
13821 |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13822 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
|
13823 (WPARAM) vk_code, (LPARAM) new_state)) |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13824 { |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13825 MSG msg; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13826 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
|
13827 return make_number (msg.wParam); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13828 } |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13829 return Qnil; |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13830 } |
13434 | 13831 |
34643
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13832 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
|
13833 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
|
13834 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
|
13835 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
|
13836 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
|
13837 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
|
13838 (filename) |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13839 Lisp_Object filename; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13840 { |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13841 Lisp_Object encoded, value; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13842 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40528
diff
changeset
|
13843 CHECK_STRING (filename); |
34643
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13844 filename = Fexpand_file_name (filename, Qnil); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13845 encoded = ENCODE_FILE (filename); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13846 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13847 value = Qnil; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13848 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13849 /* Determining the required information on Windows turns out, sadly, |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13850 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
|
13851 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
|
13852 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
|
13853 added rather late on. */ |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13854 { |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13855 HMODULE hKernel = GetModuleHandle ("kernel32"); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13856 BOOL (*pfn_GetDiskFreeSpaceEx) |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13857 (char *, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER) |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13858 = (void *) GetProcAddress (hKernel, "GetDiskFreeSpaceEx"); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13859 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13860 /* 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
|
13861 volume holding FILENAME. */ |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13862 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
|
13863 char *name = SDATA (encoded); |
34643
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13864 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13865 /* find the root name of the volume if given */ |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13866 if (isalpha (name[0]) && name[1] == ':') |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13867 { |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13868 rootname[0] = name[0]; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13869 rootname[1] = name[1]; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13870 rootname[2] = '\\'; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13871 rootname[3] = 0; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13872 } |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13873 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
|
13874 { |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13875 char *str = rootname; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13876 int slashes = 4; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13877 do |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13878 { |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13879 if (IS_DIRECTORY_SEP (*name) && --slashes == 0) |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13880 break; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13881 *str++ = *name++; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13882 } |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13883 while ( *name ); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13884 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13885 *str++ = '\\'; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13886 *str = 0; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13887 } |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13888 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13889 if (pfn_GetDiskFreeSpaceEx) |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13890 { |
44047
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
13891 /* 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
|
13892 use signed ones instead. */ |
34643
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13893 LARGE_INTEGER availbytes; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13894 LARGE_INTEGER freebytes; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13895 LARGE_INTEGER totalbytes; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13896 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13897 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
|
13898 (ULARGE_INTEGER *)&availbytes, |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
13899 (ULARGE_INTEGER *)&totalbytes, |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
13900 (ULARGE_INTEGER *)&freebytes)) |
34643
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13901 value = list3 (make_float ((double) totalbytes.QuadPart), |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13902 make_float ((double) freebytes.QuadPart), |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13903 make_float ((double) availbytes.QuadPart)); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13904 } |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13905 else |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13906 { |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13907 DWORD sectors_per_cluster; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13908 DWORD bytes_per_sector; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13909 DWORD free_clusters; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13910 DWORD total_clusters; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13911 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13912 if (GetDiskFreeSpace(rootname, |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13913 §ors_per_cluster, |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13914 &bytes_per_sector, |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13915 &free_clusters, |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13916 &total_clusters)) |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13917 value = list3 (make_float ((double) total_clusters |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13918 * sectors_per_cluster * bytes_per_sector), |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13919 make_float ((double) free_clusters |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13920 * sectors_per_cluster * bytes_per_sector), |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13921 make_float ((double) free_clusters |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13922 * sectors_per_cluster * bytes_per_sector)); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13923 } |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13924 } |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13925 |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13926 return value; |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13927 } |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
13928 |
41480
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
13929 /*********************************************************************** |
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
13930 Initialization |
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
13931 ***********************************************************************/ |
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
13932 |
50362
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13933 /* Keep this list in the same order as frame_parms in frame.c. |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13934 Use 0 for unsupported frame parameters. */ |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13935 |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13936 frame_parm_handler w32_frame_parm_handlers[] = |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13937 { |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13938 x_set_autoraise, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13939 x_set_autolower, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13940 x_set_background_color, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13941 x_set_border_color, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13942 x_set_border_width, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13943 x_set_cursor_color, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13944 x_set_cursor_type, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13945 x_set_font, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13946 x_set_foreground_color, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13947 x_set_icon_name, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13948 x_set_icon_type, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13949 x_set_internal_border_width, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13950 x_set_menu_bar_lines, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13951 x_set_mouse_color, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13952 x_explicitly_set_name, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13953 x_set_scroll_bar_width, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13954 x_set_title, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13955 x_set_unsplittable, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13956 x_set_vertical_scroll_bars, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13957 x_set_visibility, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13958 x_set_tool_bar_lines, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13959 0, /* x_set_scroll_bar_foreground, */ |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13960 0, /* x_set_scroll_bar_background, */ |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13961 x_set_screen_gamma, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13962 x_set_line_spacing, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13963 x_set_fringe_width, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13964 x_set_fringe_width, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13965 0, /* x_set_wait_for_wm, */ |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13966 x_set_fullscreen, |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13967 }; |
6d942c1d5f2d
* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
Kim F. Storm <storm@cua.dk>
parents:
50229
diff
changeset
|
13968 |
41480
2c71c672b3c7
(x_create_tip_frame): Set frame's fringes_extra to 0.
Jason Rumney <jasonr@gnu.org>
parents:
41448
diff
changeset
|
13969 void |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
13970 syms_of_w32fns () |
13434 | 13971 { |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
13972 globals_of_w32fns (); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
13973 /* This is zero if not using MS-Windows. */ |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
13974 w32_in_use = 0; |
41732
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
13975 track_mouse_window = NULL; |
0d9b74cd27cd
(trackmouse_window, track_mouse_event_fn): New vars.
Jason Rumney <jasonr@gnu.org>
parents:
41726
diff
changeset
|
13976 |
42918
9b06036a8c5e
(syms_of_w32fns): Initialize w32_visible_system_caret_hwnd.
Jason Rumney <jasonr@gnu.org>
parents:
42865
diff
changeset
|
13977 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
|
13978 |
13434 | 13979 Qnone = intern ("none"); |
13980 staticpro (&Qnone); | |
13981 Qsuppress_icon = intern ("suppress-icon"); | |
13982 staticpro (&Qsuppress_icon); | |
13983 Qundefined_color = intern ("undefined-color"); | |
13984 staticpro (&Qundefined_color); | |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
13985 Qcenter = intern ("center"); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
13986 staticpro (&Qcenter); |
36000
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13987 Qcancel_timer = intern ("cancel-timer"); |
f4a0b086cc5d
(Fx_show_tip): Fix calls to make_number.
Jason Rumney <jasonr@gnu.org>
parents:
35674
diff
changeset
|
13988 staticpro (&Qcancel_timer); |
13434 | 13989 |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13990 Qhyper = intern ("hyper"); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13991 staticpro (&Qhyper); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13992 Qsuper = intern ("super"); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13993 staticpro (&Qsuper); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13994 Qmeta = intern ("meta"); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13995 staticpro (&Qmeta); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13996 Qalt = intern ("alt"); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13997 staticpro (&Qalt); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13998 Qctrl = intern ("ctrl"); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
13999 staticpro (&Qctrl); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14000 Qcontrol = intern ("control"); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14001 staticpro (&Qcontrol); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14002 Qshift = intern ("shift"); |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14003 staticpro (&Qshift); |
43398 | 14004 /* 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
|
14005 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14006 /* 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
|
14007 Vtext_property_default_nonsticky |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14008 = 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
|
14009 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14010 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14011 Qlaplace = intern ("laplace"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14012 staticpro (&Qlaplace); |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14013 Qemboss = intern ("emboss"); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14014 staticpro (&Qemboss); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14015 Qedge_detection = intern ("edge-detection"); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14016 staticpro (&Qedge_detection); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14017 Qheuristic = intern ("heuristic"); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14018 staticpro (&Qheuristic); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14019 QCmatrix = intern (":matrix"); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14020 staticpro (&QCmatrix); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14021 QCcolor_adjustment = intern (":color-adjustment"); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14022 staticpro (&QCcolor_adjustment); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14023 QCmask = intern (":mask"); |
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14024 staticpro (&QCmask); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14025 |
13434 | 14026 Fput (Qundefined_color, Qerror_conditions, |
14027 Fcons (Qundefined_color, Fcons (Qerror, Qnil))); | |
14028 Fput (Qundefined_color, Qerror_message, | |
14029 build_string ("Undefined color")); | |
14030 | |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14031 staticpro (&w32_grabbed_keys); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14032 w32_grabbed_keys = Qnil; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14033 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14034 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
|
14035 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
|
14036 Vw32_color_map = Qnil; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14037 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14038 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
|
14039 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
|
14040 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
|
14041 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
|
14042 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
|
14043 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14044 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
|
14045 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
|
14046 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
|
14047 Vw32_alt_is_meta = Qt; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14048 |
24339
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
14049 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
|
14050 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
|
14051 XSETINT (Vw32_quit_key, 0); |
e8b73c2ac4ec
(Vw32_quit_key): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24252
diff
changeset
|
14052 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14053 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
|
14054 &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
|
14055 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
|
14056 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
|
14057 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
|
14058 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14059 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
|
14060 &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
|
14061 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
|
14062 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
|
14063 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
|
14064 |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14065 DEFVAR_INT ("w32-phantom-key-code", |
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14066 &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
|
14067 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
|
14068 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
|
14069 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14070 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
|
14071 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
|
14072 `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
|
14073 /* 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
|
14074 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
|
14075 Vw32_phantom_key_code = 255; |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14076 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14077 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
|
14078 &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
|
14079 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
|
14080 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
|
14081 Vw32_enable_num_lock = Qt; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14082 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14083 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
|
14084 &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
|
14085 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
|
14086 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
|
14087 Vw32_enable_caps_lock = Qt; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14088 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14089 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
|
14090 &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
|
14091 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
|
14092 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
|
14093 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
|
14094 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
|
14095 Vw32_scroll_lock_modifier = Qt; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14096 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14097 DEFVAR_LISP ("w32-lwindow-modifier", |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14098 &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
|
14099 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
|
14100 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
|
14101 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
|
14102 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
|
14103 Vw32_lwindow_modifier = Qnil; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14104 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14105 DEFVAR_LISP ("w32-rwindow-modifier", |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14106 &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
|
14107 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
|
14108 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
|
14109 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
|
14110 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
|
14111 Vw32_rwindow_modifier = Qnil; |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14112 |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14113 DEFVAR_LISP ("w32-apps-modifier", |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14114 &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
|
14115 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
|
14116 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
|
14117 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
|
14118 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
|
14119 Vw32_apps_modifier = Qnil; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14120 |
42845
ebb3a20bc357
(w32_load_system_font, w32_to_x_charset): Use strnicmp
Jason Rumney <jasonr@gnu.org>
parents:
42833
diff
changeset
|
14121 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
|
14122 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
|
14123 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
|
14124 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14125 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
|
14126 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
|
14127 Vw32_enable_palette = Qt; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14128 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14129 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
|
14130 &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
|
14131 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
|
14132 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
|
14133 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
|
14134 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
|
14135 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
|
14136 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
|
14137 |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14138 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
|
14139 &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
|
14140 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
|
14141 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
|
14142 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
|
14143 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
|
14144 XSETINT (Vw32_mouse_move_interval, 0); |
15290
da73440fdb5f
(Vwin32_mouse_move_interval): New lisp variable.
Karl Heuer <kwzh@gnu.org>
parents:
15280
diff
changeset
|
14145 |
42719
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
14146 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
|
14147 &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
|
14148 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
|
14149 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
|
14150 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
|
14151 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
|
14152 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
|
14153 system to handle them. */); |
70f13c4f82c7
(w32_pass_extra_mouse_buttons_to_system): New user option.
Jason Rumney <jasonr@gnu.org>
parents:
42537
diff
changeset
|
14154 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
|
14155 |
13434 | 14156 DEFVAR_LISP ("x-bitmap-file-path", &Vx_bitmap_file_path, |
49079
24de3cf96fb0
(syms_of_w32fns) <Vx_bitmap_file_path>: Doc fix.
Dave Love <fx@gnu.org>
parents:
48888
diff
changeset
|
14157 doc: /* List of directories to search for window system bitmap files. */); |
13434 | 14158 Vx_bitmap_file_path = decode_env_path ((char *) 0, "PATH"); |
14159 | |
14160 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
|
14161 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
|
14162 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
|
14163 unless you set the mouse color. */); |
13434 | 14164 Vx_pointer_shape = Qnil; |
14165 | |
14166 Vx_nontext_pointer_shape = Qnil; | |
14167 | |
14168 Vx_mode_pointer_shape = Qnil; | |
14169 | |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
14170 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
|
14171 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
|
14172 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
|
14173 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
|
14174 Vx_hourglass_pointer_shape = Qnil; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
14175 |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
14176 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
|
14177 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
|
14178 display_hourglass_p = 1; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14179 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
14180 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
|
14181 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
|
14182 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
|
14183 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
|
14184 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14185 DEFVAR_LISP ("x-sensitive-text-pointer-shape", |
13434 | 14186 &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
|
14187 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
|
14188 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
|
14189 or when you set the mouse color. */); |
13434 | 14190 Vx_sensitive_text_pointer_shape = Qnil; |
14191 | |
34133
f1063cc498e4
(Fx_create_frame): Reintroduce the call to face-set-after-frame-defaults.
Jason Rumney <jasonr@gnu.org>
parents:
34089
diff
changeset
|
14192 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
|
14193 &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
|
14194 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
|
14195 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
|
14196 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
|
14197 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
|
14198 |
13434 | 14199 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
|
14200 doc: /* A string indicating the foreground color of the cursor box. */); |
13434 | 14201 Vx_cursor_fore_pixel = Qnil; |
14202 | |
40120
03eb905a4d8e
(Fx_file_dialog): Pass a filter to GetOpenFileName.
Jason Rumney <jasonr@gnu.org>
parents:
40009
diff
changeset
|
14203 DEFVAR_LISP ("x-max-tooltip-size", &Vx_max_tooltip_size, |
41019 | 14204 doc: /* Maximum size for tooltips. |
14205 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
|
14206 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
|
14207 |
13434 | 14208 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
|
14209 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
|
14210 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
|
14211 unless you set it to something else. */); |
13434 | 14212 /* We don't have any way to find this out, so set it to nil |
14213 and maybe the user would like to set it to t. */ | |
14214 Vx_no_window_manager = Qnil; | |
14215 | |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
14216 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
|
14217 &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
|
14218 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
|
14219 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14220 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
|
14221 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
|
14222 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
|
14223 Chinese, Japanese, and Korean. */); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
14224 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
|
14225 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14226 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
|
14227 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
|
14228 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
|
14229 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
|
14230 meaning don't clear the cache. */); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14231 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
|
14232 |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
14233 DEFVAR_LISP ("w32-bdf-filename-alist", |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
14234 &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
|
14235 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
|
14236 Vw32_bdf_filename_alist = Qnil; |
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
14237 |
24481
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
14238 DEFVAR_BOOL ("w32-strict-fontnames", |
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
14239 &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
|
14240 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
|
14241 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
|
14242 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
|
14243 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
|
14244 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
|
14245 fontsets are automatically created. */); |
24481
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
14246 w32_strict_fontnames = 0; |
f65692fe7dd5
(w32_strict_fontnames): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24479
diff
changeset
|
14247 |
24695
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
14248 DEFVAR_BOOL ("w32-strict-painting", |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
14249 &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
|
14250 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
|
14251 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
|
14252 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
|
14253 w32_strict_painting = 1; |
2fe2c743ce68
(w32_strict_painting): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
24692
diff
changeset
|
14254 |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14255 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
|
14256 &Vw32_charset_info_alist, |
41019 | 14257 doc: /* Alist linking Emacs character sets to Windows fonts and codepages. |
14258 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
|
14259 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14260 (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
|
14261 |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14262 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
|
14263 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
|
14264 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
|
14265 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
|
14266 w32-charset-chinesebig5, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14267 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
|
14268 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
|
14269 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
|
14270 w32-charset-russian, w32-charset-mac, w32-charset-baltic, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14271 w32-charset-unicode, |
fb970d0c56eb
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40873
diff
changeset
|
14272 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
|
14273 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
|
14274 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
|
14275 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
|
14276 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
|
14277 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
|
14278 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14279 staticpro (&Qw32_charset_ansi); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14280 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
|
14281 staticpro (&Qw32_charset_symbol); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14282 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
|
14283 staticpro (&Qw32_charset_shiftjis); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14284 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
|
14285 staticpro (&Qw32_charset_hangeul); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
14286 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
|
14287 staticpro (&Qw32_charset_chinesebig5); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14288 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
|
14289 staticpro (&Qw32_charset_gb2312); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14290 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
|
14291 staticpro (&Qw32_charset_oem); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14292 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
|
14293 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14294 #ifdef JOHAB_CHARSET |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14295 { |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14296 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
|
14297 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
|
14298 doc: /* Internal variable. */); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14299 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14300 staticpro (&Qw32_charset_johab); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14301 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
|
14302 staticpro (&Qw32_charset_easteurope); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14303 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
|
14304 staticpro (&Qw32_charset_turkish); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14305 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
|
14306 staticpro (&Qw32_charset_baltic); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14307 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
|
14308 staticpro (&Qw32_charset_russian); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14309 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
|
14310 staticpro (&Qw32_charset_arabic); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14311 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
|
14312 staticpro (&Qw32_charset_greek); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14313 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
|
14314 staticpro (&Qw32_charset_hebrew); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14315 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
|
14316 staticpro (&Qw32_charset_vietnamese); |
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
14317 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
|
14318 staticpro (&Qw32_charset_thai); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14319 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
|
14320 staticpro (&Qw32_charset_mac); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14321 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
|
14322 } |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14323 #endif |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14324 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14325 #ifdef UNICODE_CHARSET |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14326 { |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14327 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
|
14328 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
|
14329 &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
|
14330 doc: /* Internal variable. */); |
29317
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14331 |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14332 staticpro (&Qw32_charset_unicode); |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14333 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
|
14334 #endif |
2d3d5bf49d4e
Format and doc changes to bring closer to xfns.c.
Jason Rumney <jasonr@gnu.org>
parents:
29021
diff
changeset
|
14335 |
33387
01a10bc04233
(Qw32_charset_hangeul): Rename to match w32 headers.
Jason Rumney <jasonr@gnu.org>
parents:
33216
diff
changeset
|
14336 #if 0 /* TODO: Port to W32 */ |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14337 defsubr (&Sx_change_window_property); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14338 defsubr (&Sx_delete_window_property); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14339 defsubr (&Sx_window_property); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14340 #endif |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
25646
diff
changeset
|
14341 defsubr (&Sxw_display_color_p); |
13434 | 14342 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
|
14343 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
|
14344 defsubr (&Sxw_color_values); |
13434 | 14345 defsubr (&Sx_server_max_request_size); |
14346 defsubr (&Sx_server_vendor); | |
14347 defsubr (&Sx_server_version); | |
14348 defsubr (&Sx_display_pixel_width); | |
14349 defsubr (&Sx_display_pixel_height); | |
14350 defsubr (&Sx_display_mm_width); | |
14351 defsubr (&Sx_display_mm_height); | |
14352 defsubr (&Sx_display_screens); | |
14353 defsubr (&Sx_display_planes); | |
14354 defsubr (&Sx_display_color_cells); | |
14355 defsubr (&Sx_display_visual_class); | |
14356 defsubr (&Sx_display_backing_store); | |
14357 defsubr (&Sx_display_save_under); | |
14358 defsubr (&Sx_create_frame); | |
14359 defsubr (&Sx_open_connection); | |
14360 defsubr (&Sx_close_connection); | |
14361 defsubr (&Sx_display_list); | |
14362 defsubr (&Sx_synchronize); | |
14363 | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14364 /* W32 specific functions */ |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14365 |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14366 defsubr (&Sw32_focus_frame); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14367 defsubr (&Sw32_select_font); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14368 defsubr (&Sw32_define_rgb_color); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14369 defsubr (&Sw32_default_color_map); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14370 defsubr (&Sw32_load_color_file); |
19707
0181cc080316
Include limits.h and errno.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18508
diff
changeset
|
14371 defsubr (&Sw32_send_sys_command); |
24670 | 14372 defsubr (&Sw32_shell_execute); |
23681
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14373 defsubr (&Sw32_register_hot_key); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14374 defsubr (&Sw32_unregister_hot_key); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14375 defsubr (&Sw32_registered_hot_keys); |
af0276da2059
(Vw32_pass_optional_keys_to_system): Variable removed.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23637
diff
changeset
|
14376 defsubr (&Sw32_reconstruct_hot_key); |
23803
f112aa8f8f5d
(Vw32_phantom_key_code): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23801
diff
changeset
|
14377 defsubr (&Sw32_toggle_lock_key); |
24147
c83b0bc4e8b9
(Vw32_bdf_filename_alist): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24130
diff
changeset
|
14378 defsubr (&Sw32_find_bdf_fonts); |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
14379 |
34643
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14380 defsubr (&Sfile_system_info); |
7108531c744b
(Ffile_system_info): New function.
Andrew Innes <andrewi@gnu.org>
parents:
34638
diff
changeset
|
14381 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
14382 /* Setting callback functions for fontset handler. */ |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
14383 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
|
14384 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14385 #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
|
14386 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
|
14387 list_fonts_func = w32_list_fonts; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14388 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14389 |
23506
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
14390 load_font_func = w32_load_font; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
14391 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
|
14392 query_font_func = w32_query_font; |
246a14f0622f
(Vx_pixel_size_width): New global variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23407
diff
changeset
|
14393 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
|
14394 check_window_system_func = check_w32; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14395 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14396 /* Images. */ |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14397 Qxbm = intern ("xbm"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14398 staticpro (&Qxbm); |
35359
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
14399 QCconversion = intern (":conversion"); |
b5a2207901e0
(QCconversion): Replaces QCalgorithm. Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents:
35288
diff
changeset
|
14400 staticpro (&QCconversion); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14401 QCheuristic_mask = intern (":heuristic-mask"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14402 staticpro (&QCheuristic_mask); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14403 QCcolor_symbols = intern (":color-symbols"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14404 staticpro (&QCcolor_symbols); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14405 QCascent = intern (":ascent"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14406 staticpro (&QCascent); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14407 QCmargin = intern (":margin"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14408 staticpro (&QCmargin); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14409 QCrelief = intern (":relief"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14410 staticpro (&QCrelief); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14411 Qpostscript = intern ("postscript"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14412 staticpro (&Qpostscript); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14413 QCloader = intern (":loader"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14414 staticpro (&QCloader); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14415 QCbounding_box = intern (":bounding-box"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14416 staticpro (&QCbounding_box); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14417 QCpt_width = intern (":pt-width"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14418 staticpro (&QCpt_width); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14419 QCpt_height = intern (":pt-height"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14420 staticpro (&QCpt_height); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14421 QCindex = intern (":index"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14422 staticpro (&QCindex); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14423 Qpbm = intern ("pbm"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14424 staticpro (&Qpbm); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14425 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14426 #if HAVE_XPM |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14427 Qxpm = intern ("xpm"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14428 staticpro (&Qxpm); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14429 #endif |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14430 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14431 #if HAVE_JPEG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14432 Qjpeg = intern ("jpeg"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14433 staticpro (&Qjpeg); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14434 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14435 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14436 #if HAVE_TIFF |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14437 Qtiff = intern ("tiff"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14438 staticpro (&Qtiff); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14439 #endif |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14440 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14441 #if HAVE_GIF |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14442 Qgif = intern ("gif"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14443 staticpro (&Qgif); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14444 #endif |
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 #if HAVE_PNG |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14447 Qpng = intern ("png"); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14448 staticpro (&Qpng); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14449 #endif |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14450 |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14451 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
|
14452 defsubr (&Simage_size); |
73645cbc79a7
(x_set_cursor_color): Set foreground of cursor, not frame.
Jason Rumney <jasonr@gnu.org>
parents:
43963
diff
changeset
|
14453 defsubr (&Simage_mask_p); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14454 |
36252
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
14455 hourglass_atimer = NULL; |
a8630c63f7d5
Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents:
36080
diff
changeset
|
14456 hourglass_shown_p = 0; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14457 defsubr (&Sx_show_tip); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14458 defsubr (&Sx_hide_tip); |
34729
3dc60d80125f
(syms_of_w32fns): Initialize and staticpro tip_frame.
Jason Rumney <jasonr@gnu.org>
parents:
34698
diff
changeset
|
14459 tip_timer = Qnil; |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14460 staticpro (&tip_timer); |
34729
3dc60d80125f
(syms_of_w32fns): Initialize and staticpro tip_frame.
Jason Rumney <jasonr@gnu.org>
parents:
34698
diff
changeset
|
14461 tip_frame = Qnil; |
3dc60d80125f
(syms_of_w32fns): Initialize and staticpro tip_frame.
Jason Rumney <jasonr@gnu.org>
parents:
34698
diff
changeset
|
14462 staticpro (&tip_frame); |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14463 |
41380
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14464 last_show_tip_args = Qnil; |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14465 staticpro (&last_show_tip_args); |
aff1b15f295b
(x_window_to_frame): Remove irrelevant TODO comment.
Jason Rumney <jasonr@gnu.org>
parents:
41322
diff
changeset
|
14466 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14467 defsubr (&Sx_file_dialog); |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14468 } |
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14469 |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
14470 |
48888
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
14471 /* |
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
14472 globals_of_w32fns is used to initialize those global variables that |
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
14473 must always be initialized on startup even when the global variable |
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
14474 initialized is non zero (see the function main in emacs.c). |
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
14475 globals_of_w32fns is called from syms_of_w32fns when the global |
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
14476 variable initialized is 0 and directly from main when initialized |
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
14477 is non zero. |
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
14478 */ |
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
14479 void globals_of_w32fns () |
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
14480 { |
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
14481 HMODULE user32_lib = GetModuleHandle ("user32.dll"); |
51776
6a03280c654a
(clipboard_sequence_fn): New variable.
Jason Rumney <jasonr@gnu.org>
parents:
51763
diff
changeset
|
14482 /* |
6a03280c654a
(clipboard_sequence_fn): New variable.
Jason Rumney <jasonr@gnu.org>
parents:
51763
diff
changeset
|
14483 TrackMouseEvent not available in all versions of Windows, so must load |
6a03280c654a
(clipboard_sequence_fn): New variable.
Jason Rumney <jasonr@gnu.org>
parents:
51763
diff
changeset
|
14484 it dynamically. Do it once, here, instead of every time it is used. |
48888
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
14485 */ |
51776
6a03280c654a
(clipboard_sequence_fn): New variable.
Jason Rumney <jasonr@gnu.org>
parents:
51763
diff
changeset
|
14486 track_mouse_event_fn = (TrackMouseEvent_Proc) |
6a03280c654a
(clipboard_sequence_fn): New variable.
Jason Rumney <jasonr@gnu.org>
parents:
51763
diff
changeset
|
14487 GetProcAddress (user32_lib, "TrackMouseEvent"); |
6a03280c654a
(clipboard_sequence_fn): New variable.
Jason Rumney <jasonr@gnu.org>
parents:
51763
diff
changeset
|
14488 /* ditto for GetClipboardSequenceNumber. */ |
6a03280c654a
(clipboard_sequence_fn): New variable.
Jason Rumney <jasonr@gnu.org>
parents:
51763
diff
changeset
|
14489 clipboard_sequence_fn = (ClipboardSequence_Proc) |
6a03280c654a
(clipboard_sequence_fn): New variable.
Jason Rumney <jasonr@gnu.org>
parents:
51763
diff
changeset
|
14490 GetProcAddress (user32_lib, "GetClipboardSequenceNumber"); |
48888
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
14491 } |
f0df5f687c15
Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker
Ben Key <bkey1@tampabay.rr.com>
parents:
48483
diff
changeset
|
14492 |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14493 /* Initialize image types. Based on which libraries are available. */ |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14494 static void |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14495 init_external_image_libraries () |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14496 { |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
14497 HINSTANCE library; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14498 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14499 #if HAVE_XPM |
49562
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
14500 if ((library = LoadLibrary ("libXpm.dll"))) |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
14501 { |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
14502 if (init_xpm_functions (library)) |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
14503 define_image_type (&xpm_type); |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
14504 } |
e31e2b0f73c7
(w32_create_pixmap_from_bitmap_data): Use alloca for
Jason Rumney <jasonr@gnu.org>
parents:
49543
diff
changeset
|
14505 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14506 #endif |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14507 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14508 #if HAVE_JPEG |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
14509 /* Try loading jpeg library under probable names. */ |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
14510 if ((library = LoadLibrary ("libjpeg.dll")) |
49527
356642af7816
(init_external_image_libraries): Add missing operator.
Juanma Barranquero <lekktu@gmail.com>
parents:
49524
diff
changeset
|
14511 || (library = LoadLibrary ("jpeg-62.dll")) |
49494
07f0ea120d7d
(init_external_image_libraries): Try alternate names for the jpeg dll.
Juanma Barranquero <lekktu@gmail.com>
parents:
49455
diff
changeset
|
14512 || (library = LoadLibrary ("jpeg.dll"))) |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
14513 { |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
14514 if (init_jpeg_functions (library)) |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
14515 define_image_type (&jpeg_type); |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
14516 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14517 #endif |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14518 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14519 #if HAVE_TIFF |
49543
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
14520 if (library = LoadLibrary ("libtiff.dll")) |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
14521 { |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
14522 if (init_tiff_functions (library)) |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
14523 define_image_type (&tiff_type); |
954b23b1037b
(init_tiff_functions): New function.
Juanma Barranquero <lekktu@gmail.com>
parents:
49540
diff
changeset
|
14524 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14525 #endif |
44109
b615e4daf825
[HAVE_IMAGES, HAVE_PBM]: Remove conditionals.
Jason Rumney <jasonr@gnu.org>
parents:
44097
diff
changeset
|
14526 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14527 #if HAVE_GIF |
49540
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
14528 if (library = LoadLibrary ("libungif.dll")) |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
14529 { |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
14530 if (init_gif_functions (library)) |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
14531 define_image_type (&gif_type); |
a38733d32d73
(DrawText): Kludge to avoid a redefinition on Windows when including gif_lib.h.
Juanma Barranquero <lekktu@gmail.com>
parents:
49527
diff
changeset
|
14532 } |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14533 #endif |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14534 |
27397
d98e84b468a2
Substantial rewrite for new redisplay. Major changes:
Jason Rumney <jasonr@gnu.org>
parents:
26729
diff
changeset
|
14535 #if HAVE_PNG |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14536 /* Ensure zlib is loaded. Try debug version first. */ |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14537 if (!LoadLibrary ("zlibd.dll")) |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14538 LoadLibrary ("zlib.dll"); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14539 |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14540 /* Try loading libpng under probable names. */ |
49455
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
14541 if ((library = LoadLibrary ("libpng13d.dll")) |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
14542 || (library = LoadLibrary ("libpng13.dll")) |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
14543 || (library = LoadLibrary ("libpng12d.dll")) |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
14544 || (library = LoadLibrary ("libpng12.dll")) |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
14545 || (library = LoadLibrary ("libpng.dll"))) |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
14546 { |
a6825c5c7ce7
(init_jpeg_functions, jpeg_resync_to_restart_wrapper):
Jason Rumney <jasonr@gnu.org>
parents:
49448
diff
changeset
|
14547 if (init_png_functions (library)) |
49448
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14548 define_image_type (&png_type); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14549 } |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14550 #endif |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14551 } |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14552 |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14553 void |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14554 init_xfns () |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14555 { |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14556 image_types = NULL; |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14557 Vimage_types = Qnil; |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14558 |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14559 define_image_type (&pbm_type); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14560 define_image_type (&xbm_type); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14561 |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14562 #if 0 /* TODO : Ghostscript support for W32 */ |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14563 define_image_type (&gs_type); |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14564 #endif |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14565 |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14566 /* Image types that rely on external libraries are loaded dynamically |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14567 if the library is available. */ |
26edfad422c5
(XPutPixel): Handle monochrome images; used for masks.
Jason Rumney <jasonr@gnu.org>
parents:
49432
diff
changeset
|
14568 init_external_image_libraries (); |
13434 | 14569 } |
14570 | |
14571 #undef abort | |
14572 | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
14573 void |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16259
diff
changeset
|
14574 w32_abort() |
13434 | 14575 { |
15147
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14576 int button; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14577 button = MessageBox (NULL, |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14578 "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
|
14579 "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
|
14580 "Emacs Abort Dialog", |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14581 MB_ICONEXCLAMATION | MB_TASKMODAL |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14582 | MB_SETFOREGROUND | MB_ABORTRETRYIGNORE); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14583 switch (button) |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14584 { |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14585 case IDRETRY: |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14586 DebugBreak (); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14587 break; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14588 case IDIGNORE: |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14589 break; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14590 case IDABORT: |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14591 default: |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14592 abort (); |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14593 break; |
38c0ce06203f
(quit_char, Vwin32_enable_italics, Vwin32_enable_palette):
Geoff Voelker <voelker@cs.washington.edu>
parents:
15034
diff
changeset
|
14594 } |
13434 | 14595 } |
15148
220145cf7546
(continuation of previous checkin)
Geoff Voelker <voelker@cs.washington.edu>
parents:
15147
diff
changeset
|
14596 |
23801
119fd94ae526
(w32_last_error): Fix cut+paste error.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23681
diff
changeset
|
14597 /* For convenience when debugging. */ |
119fd94ae526
(w32_last_error): Fix cut+paste error.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23681
diff
changeset
|
14598 int |
119fd94ae526
(w32_last_error): Fix cut+paste error.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23681
diff
changeset
|
14599 w32_last_error() |
119fd94ae526
(w32_last_error): Fix cut+paste error.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23681
diff
changeset
|
14600 { |
119fd94ae526
(w32_last_error): Fix cut+paste error.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23681
diff
changeset
|
14601 return GetLastError (); |
119fd94ae526
(w32_last_error): Fix cut+paste error.
Geoff Voelker <voelker@cs.washington.edu>
parents:
23681
diff
changeset
|
14602 } |
52401 | 14603 |
14604 /* arch-tag: 707589ab-b9be-4638-8cdd-74629cc9b446 | |
14605 (do not change this comment) */ |