Mercurial > emacs
annotate src/xterm.c @ 55017:a02bf82eebbd
* progmodes/grep.el (grep-mode): Add eval-when-compile.
| author | Jan Dj?rv <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 20 Apr 2004 21:19:44 +0000 |
| parents | edff9ce01ed0 |
| children | 44eb66585062 1029206e72f2 |
| rev | line source |
|---|---|
| 286 | 1 /* X Communication module for terminals which understand the X protocol. |
|
51048
7ac9c3bea5ea
(Fselect_window): Add optional arg `norecord'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50521
diff
changeset
|
2 Copyright (C) 1989, 93, 94, 95, 96, 97, 98, 1999, 2000, 01, 02, 2003 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3 Free Software Foundation, Inc. |
| 286 | 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 | |
| 621 | 9 the Free Software Foundation; either version 2, or (at your option) |
| 286 | 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:
14165
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:
14165
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
| 286 | 21 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
22 /* New display code by Gerd Moellmann <gerd@gnu.org>. */ |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
23 /* Xt features made by Fred Pierresteguy. */ |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
24 |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25921
diff
changeset
|
25 #include <config.h> |
|
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25921
diff
changeset
|
26 |
|
2977
ddcad1457cd5
Move signal.h and stdio.h before config.h.
Richard M. Stallman <rms@gnu.org>
parents:
2958
diff
changeset
|
27 /* On 4.3 these lose if they come after xterm.h. */ |
|
ddcad1457cd5
Move signal.h and stdio.h before config.h.
Richard M. Stallman <rms@gnu.org>
parents:
2958
diff
changeset
|
28 /* Putting these at the beginning seems to be standard for other .c files. */ |
|
ddcad1457cd5
Move signal.h and stdio.h before config.h.
Richard M. Stallman <rms@gnu.org>
parents:
2958
diff
changeset
|
29 #include <signal.h> |
|
ddcad1457cd5
Move signal.h and stdio.h before config.h.
Richard M. Stallman <rms@gnu.org>
parents:
2958
diff
changeset
|
30 |
|
7902
22b9aaaf0302
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7870
diff
changeset
|
31 #include <stdio.h> |
|
22b9aaaf0302
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7870
diff
changeset
|
32 |
| 286 | 33 #ifdef HAVE_X_WINDOWS |
| 34 | |
| 35 #include "lisp.h" | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2353
diff
changeset
|
36 #include "blockinput.h" |
| 286 | 37 |
|
21933
58f3be08e692
Include syssignal.h after lisp.h.
Andreas Schwab <schwab@suse.de>
parents:
21903
diff
changeset
|
38 /* Need syssignal.h for various externs and definitions that may be required |
|
58f3be08e692
Include syssignal.h after lisp.h.
Andreas Schwab <schwab@suse.de>
parents:
21903
diff
changeset
|
39 by some configurations for calls to signal later in this source file. */ |
|
58f3be08e692
Include syssignal.h after lisp.h.
Andreas Schwab <schwab@suse.de>
parents:
21903
diff
changeset
|
40 #include "syssignal.h" |
|
58f3be08e692
Include syssignal.h after lisp.h.
Andreas Schwab <schwab@suse.de>
parents:
21903
diff
changeset
|
41 |
| 286 | 42 /* This may include sys/types.h, and that somehow loses |
| 43 if this is not done before the other system files. */ | |
| 44 #include "xterm.h" | |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
45 #include <X11/cursorfont.h> |
| 286 | 46 |
| 47 /* Load sys/types.h if not already loaded. | |
| 48 In some systems loading it twice is suicidal. */ | |
| 49 #ifndef makedev | |
| 50 #include <sys/types.h> | |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
51 #endif /* makedev */ |
| 286 | 52 |
|
16220
02044b05d8e0
Replaced symbol BSD with BSD_SYSTEM.
Karl Heuer <kwzh@gnu.org>
parents:
16209
diff
changeset
|
53 #ifdef BSD_SYSTEM |
| 286 | 54 #include <sys/ioctl.h> |
|
16220
02044b05d8e0
Replaced symbol BSD with BSD_SYSTEM.
Karl Heuer <kwzh@gnu.org>
parents:
16209
diff
changeset
|
55 #endif /* ! defined (BSD_SYSTEM) */ |
| 286 | 56 |
|
3355
e0c2e8a2ef75
(XTread_socket, case KeyPress) [HPUX]: Test IsModifiedKey.
Richard M. Stallman <rms@gnu.org>
parents:
3284
diff
changeset
|
57 #include "systty.h" |
| 555 | 58 #include "systime.h" |
| 286 | 59 |
|
6616
951c8941b931
[INCLUDED_FCNTL]: Don't include fcntl.h again.
Richard M. Stallman <rms@gnu.org>
parents:
6560
diff
changeset
|
60 #ifndef INCLUDED_FCNTL |
| 286 | 61 #include <fcntl.h> |
|
6616
951c8941b931
[INCLUDED_FCNTL]: Don't include fcntl.h again.
Richard M. Stallman <rms@gnu.org>
parents:
6560
diff
changeset
|
62 #endif |
| 286 | 63 #include <ctype.h> |
| 64 #include <errno.h> | |
| 65 #include <setjmp.h> | |
| 66 #include <sys/stat.h> | |
| 10366 | 67 /* Caused redefinition of DBL_DIG on Netbsd; seems not to be needed. */ |
| 68 /* #include <sys/param.h> */ | |
| 286 | 69 |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
70 #include "charset.h" |
| 30748 | 71 #include "coding.h" |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
72 #include "ccl.h" |
|
23515
1e52542fb338
Include frame.h before fontset.h.
Kenichi Handa <handa@m17n.org>
parents:
23162
diff
changeset
|
73 #include "frame.h" |
|
28231
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
74 #include "dispextern.h" |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
75 #include "fontset.h" |
| 286 | 76 #include "termhooks.h" |
| 77 #include "termopts.h" | |
| 78 #include "termchar.h" | |
| 79 #include "gnu.h" | |
| 80 #include "disptab.h" | |
| 81 #include "buffer.h" | |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
82 #include "window.h" |
| 8652 | 83 #include "keyboard.h" |
| 8848 | 84 #include "intervals.h" |
| 21514 | 85 #include "process.h" |
|
27428
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
86 #include "atimer.h" |
|
39697
0b986bb45526
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
87 #include "keymap.h" |
| 286 | 88 |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
89 #ifdef USE_X_TOOLKIT |
|
15117
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
90 #include <X11/Shell.h> |
|
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
91 #endif |
|
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
92 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
93 #ifdef HAVE_SYS_TIME_H |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
94 #include <sys/time.h> |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
95 #endif |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
96 #ifdef HAVE_UNISTD_H |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
97 #include <unistd.h> |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
98 #endif |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
99 |
| 49322 | 100 #ifdef USE_GTK |
| 101 #include "gtkutil.h" | |
| 102 #endif | |
| 103 | |
|
39922
538760a4422e
(xlwmenu_window_p, xlwmenu_redisplay): Add prototypes.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39914
diff
changeset
|
104 #ifdef USE_LUCID |
| 46113 | 105 extern int xlwmenu_window_p P_ ((Widget w, Window window)); |
|
39922
538760a4422e
(xlwmenu_window_p, xlwmenu_redisplay): Add prototypes.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39914
diff
changeset
|
106 extern void xlwmenu_redisplay P_ ((Widget)); |
|
538760a4422e
(xlwmenu_window_p, xlwmenu_redisplay): Add prototypes.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39914
diff
changeset
|
107 #endif |
|
538760a4422e
(xlwmenu_window_p, xlwmenu_redisplay): Add prototypes.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39914
diff
changeset
|
108 |
| 49322 | 109 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
110 |
| 30321 | 111 extern void free_frame_menubar P_ ((struct frame *)); |
| 112 extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, | |
| 113 int)); | |
| 49322 | 114 #endif |
| 115 | |
| 116 #ifdef USE_X_TOOLKIT | |
|
13507
9a9f459075af
(HACK_EDITRES): Define here as in xfns.c.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
117 #if (XtSpecificationRelease >= 5) && !defined(NO_EDITRES) |
|
9a9f459075af
(HACK_EDITRES): Define here as in xfns.c.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
118 #define HACK_EDITRES |
|
6941
a914781ef58a
(Xatom_editres_name): Variable defined.
Richard M. Stallman <rms@gnu.org>
parents:
6934
diff
changeset
|
119 extern void _XEditResCheckMessages (); |
|
13507
9a9f459075af
(HACK_EDITRES): Define here as in xfns.c.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
120 #endif /* not NO_EDITRES */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
121 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
122 /* Include toolkit specific headers for the scroll bar widget. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
123 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
124 #ifdef USE_TOOLKIT_SCROLL_BARS |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
125 #if defined USE_MOTIF |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
126 #include <Xm/Xm.h> /* for LESSTIF_VERSION */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
127 #include <Xm/ScrollBar.h> |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
128 #else /* !USE_MOTIF i.e. use Xaw */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
129 |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
130 #ifdef HAVE_XAW3D |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
131 #include <X11/Xaw3d/Simple.h> |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
132 #include <X11/Xaw3d/Scrollbar.h> |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
133 #define ARROW_SCROLLBAR |
|
53021
92d82baef50b
* xterm.c (XAW_ARROW_SCROLLBARS): Define it for Xaw 1.5E.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52984
diff
changeset
|
134 #define XAW_ARROW_SCROLLBARS |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
135 #include <X11/Xaw3d/ScrollbarP.h> |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
136 #else /* !HAVE_XAW3D */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
137 #include <X11/Xaw/Simple.h> |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
138 #include <X11/Xaw/Scrollbar.h> |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
139 #endif /* !HAVE_XAW3D */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
140 #ifndef XtNpickTop |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
141 #define XtNpickTop "pickTop" |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
142 #endif /* !XtNpickTop */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
143 #endif /* !USE_MOTIF */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
144 #endif /* USE_TOOLKIT_SCROLL_BARS */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
145 |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
146 #endif /* USE_X_TOOLKIT */ |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
147 |
| 49322 | 148 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) |
|
6022
713d4d840a11
(x_had_errors_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6010
diff
changeset
|
149 #define x_any_window_to_frame x_window_to_frame |
|
6983
b18e5c09d7c3
(XTread_socket, case ClientMessage): Use x_window_to_frame unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
6941
diff
changeset
|
150 #define x_top_window_to_frame x_window_to_frame |
|
6022
713d4d840a11
(x_had_errors_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6010
diff
changeset
|
151 #endif |
|
713d4d840a11
(x_had_errors_p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6010
diff
changeset
|
152 |
|
7602
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
153 #ifdef USE_X_TOOLKIT |
| 12189 | 154 #include "widget.h" |
|
7602
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
155 #ifndef XtNinitialState |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
156 #define XtNinitialState "initialState" |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
157 #endif |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
158 #endif |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
159 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
160 #define abs(x) ((x) < 0 ? -(x) : (x)) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
161 |
| 51129 | 162 /* Default to using XIM if available. */ |
|
51823
01bf5601e788
(use_xim) [!USE_XIM]: Default to disable XIM if emacs
Kim F. Storm <storm@cua.dk>
parents:
51676
diff
changeset
|
163 #ifdef USE_XIM |
| 51129 | 164 int use_xim = 1; |
|
51823
01bf5601e788
(use_xim) [!USE_XIM]: Default to disable XIM if emacs
Kim F. Storm <storm@cua.dk>
parents:
51676
diff
changeset
|
165 #else |
|
01bf5601e788
(use_xim) [!USE_XIM]: Default to disable XIM if emacs
Kim F. Storm <storm@cua.dk>
parents:
51676
diff
changeset
|
166 int use_xim = 0; /* configure --without-xim */ |
|
01bf5601e788
(use_xim) [!USE_XIM]: Default to disable XIM if emacs
Kim F. Storm <storm@cua.dk>
parents:
51676
diff
changeset
|
167 #endif |
|
01bf5601e788
(use_xim) [!USE_XIM]: Default to disable XIM if emacs
Kim F. Storm <storm@cua.dk>
parents:
51676
diff
changeset
|
168 |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
169 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
170 |
|
34869
1d671133e618
(syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars
Gerd Moellmann <gerd@gnu.org>
parents:
34673
diff
changeset
|
171 /* Non-nil means Emacs uses toolkit scroll bars. */ |
|
1d671133e618
(syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars
Gerd Moellmann <gerd@gnu.org>
parents:
34673
diff
changeset
|
172 |
|
1d671133e618
(syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars
Gerd Moellmann <gerd@gnu.org>
parents:
34673
diff
changeset
|
173 Lisp_Object Vx_toolkit_scroll_bars; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
174 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
175 /* Non-zero means that a HELP_EVENT has been generated since Emacs |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
176 start. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
177 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
178 static int any_help_event_p; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
179 |
|
44359
ff9f7aee02c8
Rename autoselect_window_p to mouse_autoselect_window.
Pavel Jan?k <Pavel@Janik.cz>
parents:
44313
diff
changeset
|
180 /* Last window where we saw the mouse. Used by mouse-autoselect-window. */ |
|
44301
1892db006468
(autoselect_window_p): Renamed from `x_autoselect_window_p'.
Pavel Jan?k <Pavel@Janik.cz>
parents:
44275
diff
changeset
|
181 static Lisp_Object last_window; |
|
43343
ac7b0c0802cc
(x-autoselect-window): New variable.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43302
diff
changeset
|
182 |
|
37153
3799cab1815b
(x_use_underline_position_properties): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37143
diff
changeset
|
183 /* Non-zero means make use of UNDERLINE_POSITION font properties. */ |
|
3799cab1815b
(x_use_underline_position_properties): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37143
diff
changeset
|
184 |
|
3799cab1815b
(x_use_underline_position_properties): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37143
diff
changeset
|
185 int x_use_underline_position_properties; |
|
3799cab1815b
(x_use_underline_position_properties): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37143
diff
changeset
|
186 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
187 /* This is a chain of structures for all the X displays currently in |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
188 use. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
189 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
190 struct x_display_info *x_display_list; |
| 286 | 191 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
192 /* This is a list of cons cells, each of the form (NAME |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
193 . FONT-LIST-CACHE), one for each element of x_display_list and in |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
194 the same order. NAME is the name of the frame. FONT-LIST-CACHE |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
195 records previous values returned by x-list-fonts. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
196 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
197 Lisp_Object x_display_name_list; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
198 |
|
2474
86c8a6e08fd4
Fix typo in comment delimiter.
Richard M. Stallman <rms@gnu.org>
parents:
2468
diff
changeset
|
199 /* Frame being updated by update_frame. This is declared in term.c. |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
200 This is set by update_begin and looked at by all the XT functions. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
201 It is zero while not inside an update. In that case, the XT |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
202 functions assume that `selected_frame' is the frame to apply to. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
203 |
|
2468
35aa32e1a003
* xterm.c (updating_frame): Declare this extern instead of static,
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
204 extern struct frame *updating_frame; |
| 771 | 205 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
206 /* This is a frame waiting to be auto-raised, within XTread_socket. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
207 |
|
6883
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
208 struct frame *pending_autoraise_frame; |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
209 |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
210 #ifdef USE_X_TOOLKIT |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
211 /* The application context for Xt use. */ |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
212 XtAppContext Xt_app_con; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
213 static String Xt_default_resources[] = {0}; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
214 #endif /* USE_X_TOOLKIT */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
215 |
|
27428
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
216 /* Non-zero means user is interacting with a toolkit scroll bar. */ |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
217 |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
218 static int toolkit_scroll_bar_interaction; |
| 286 | 219 |
|
54650
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
220 /* Non-zero means to not move point as a result of clicking on a |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
221 frame to focus it (when focus-follows-mouse is nil). */ |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
222 |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
223 int x_mouse_click_focus_ignore_position; |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
224 |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
225 /* Non-zero timeout value means ignore next mouse click if it arrives |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
226 before that timeout elapses (i.e. as part of the same sequence of |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
227 events resulting from clicking on a frame to select it). */ |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
228 |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
229 static unsigned long ignore_next_mouse_click_timeout; |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
230 |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
231 /* Mouse movement. |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
232 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
233 Formerly, we used PointerMotionHintMask (in standard_event_mask) |
|
15042
c99dd01d9334
(note_mouse_movement): Don't call XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
14963
diff
changeset
|
234 so that we would have to call XQueryPointer after each MotionNotify |
|
c99dd01d9334
(note_mouse_movement): Don't call XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
14963
diff
changeset
|
235 event to ask for another such event. However, this made mouse tracking |
|
c99dd01d9334
(note_mouse_movement): Don't call XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
14963
diff
changeset
|
236 slow, and there was a bug that made it eventually stop. |
|
c99dd01d9334
(note_mouse_movement): Don't call XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
14963
diff
changeset
|
237 |
|
c99dd01d9334
(note_mouse_movement): Don't call XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
14963
diff
changeset
|
238 Simply asking for MotionNotify all the time seems to work better. |
|
c99dd01d9334
(note_mouse_movement): Don't call XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
14963
diff
changeset
|
239 |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
240 In order to avoid asking for motion events and then throwing most |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
241 of them away or busy-polling the server for mouse positions, we ask |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
242 the server for pointer motion hints. This means that we get only |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
243 one event per group of mouse movements. "Groups" are delimited by |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
244 other kinds of events (focus changes and button clicks, for |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
245 example), or by XQueryPointer calls; when one of these happens, we |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
246 get another MotionNotify event the next time the mouse moves. This |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
247 is at least as efficient as getting motion events when mouse |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
248 tracking is on, and I suspect only negligibly worse when tracking |
|
15042
c99dd01d9334
(note_mouse_movement): Don't call XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
14963
diff
changeset
|
249 is off. */ |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
250 |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
251 /* Where the mouse was last time we reported a mouse event. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
252 |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
253 static XRectangle last_mouse_glyph; |
|
15803
f214673e68a8
(XTread_socket): Pass keys in menu bar to toolkit alone
Richard M. Stallman <rms@gnu.org>
parents:
15794
diff
changeset
|
254 static Lisp_Object last_mouse_press_frame; |
|
f214673e68a8
(XTread_socket): Pass keys in menu bar to toolkit alone
Richard M. Stallman <rms@gnu.org>
parents:
15794
diff
changeset
|
255 |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
256 /* The scroll bar in which the last X motion event occurred. |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
257 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
258 If the last X motion event occurred in a scroll bar, we set this so |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
259 XTmouse_position can know whether to report a scroll bar motion or |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
260 an ordinary motion. |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
261 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
262 If the last X motion event didn't occur in a scroll bar, we set |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
263 this to Qnil, to tell XTmouse_position to return an ordinary motion |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
264 event. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
265 |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
266 static Lisp_Object last_mouse_scroll_bar; |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
267 |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
268 /* This is a hack. We would really prefer that XTmouse_position would |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
269 return the time associated with the position it returns, but there |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
270 doesn't seem to be any way to wrest the time-stamp from the server |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
271 along with the position query. So, we just keep track of the time |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
272 of the last movement we received, and return that in hopes that |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
273 it's somewhat accurate. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
274 |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
275 static Time last_mouse_movement_time; |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
276 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
277 /* Incremented by XTread_socket whenever it really tries to read |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
278 events. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
279 |
|
9337
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
280 #ifdef __STDC__ |
|
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
281 static int volatile input_signal_count; |
|
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
282 #else |
|
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
283 static int input_signal_count; |
|
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
284 #endif |
|
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
285 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
286 /* Used locally within XTread_socket. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
287 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
288 static int x_noop_count; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
289 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
290 /* Initial values of argv and argc. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
291 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
292 extern char **initial_argv; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
293 extern int initial_argc; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
294 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
295 extern Lisp_Object Vcommand_line_args, Vsystem_name; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
296 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
297 /* Tells if a window manager is present or not. */ |
| 286 | 298 |
| 299 extern Lisp_Object Vx_no_window_manager; | |
| 300 | |
|
53336
9a1b69cfa7be
(Qface, Qmouse_face): Remove unused externs.
Kim F. Storm <storm@cua.dk>
parents:
53083
diff
changeset
|
301 extern Lisp_Object Qeql; |
|
6616
951c8941b931
[INCLUDED_FCNTL]: Don't include fcntl.h again.
Richard M. Stallman <rms@gnu.org>
parents:
6560
diff
changeset
|
302 |
| 286 | 303 extern int errno; |
| 304 | |
|
2661
77f1457d000e
Implement extra_keyboard_modifiers properly.
Jim Blandy <jimb@redhat.com>
parents:
2474
diff
changeset
|
305 /* A mask of extra modifier bits to put into every keyboard char. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
306 |
|
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43621
diff
changeset
|
307 extern EMACS_INT extra_keyboard_modifiers; |
|
1841
338e4ffdb54b
(XTread_socket): Support extra_keyboard_modifiers.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
308 |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
309 /* The keysyms to use for the various modifiers. */ |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
310 |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
311 Lisp_Object Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym, Vx_super_keysym; |
| 48085 | 312 Lisp_Object Vx_keysym_table; |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
313 static Lisp_Object Qalt, Qhyper, Qmeta, Qsuper, Qmodifier_value; |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
314 |
|
11807
73fb6570f718
(Qvendor_specific_keysyms): New var.
Karl Heuer <kwzh@gnu.org>
parents:
11610
diff
changeset
|
315 static Lisp_Object Qvendor_specific_keysyms; |
| 51405 | 316 static Lisp_Object Qlatin_1; |
|
11807
73fb6570f718
(Qvendor_specific_keysyms): New var.
Karl Heuer <kwzh@gnu.org>
parents:
11610
diff
changeset
|
317 |
| 30321 | 318 extern XrmDatabase x_load_resources P_ ((Display *, char *, char *, char *)); |
| 52631 | 319 extern int x_bitmap_mask P_ ((FRAME_PTR, int)); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
320 |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
321 static int x_alloc_nearest_color_1 P_ ((Display *, Colormap, XColor *)); |
|
35487
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
322 static void x_set_window_size_1 P_ ((struct frame *, int, int, int)); |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
323 static const XColor *x_color_cells P_ ((Display *, int *)); |
|
30160
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
324 static void x_update_window_end P_ ((struct window *, int, int)); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
325 void x_delete_display P_ ((struct x_display_info *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
326 static unsigned int x_x_to_emacs_modifiers P_ ((struct x_display_info *, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
327 unsigned)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
328 static int x_io_error_quitter P_ ((Display *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
329 int x_catch_errors P_ ((Display *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
330 void x_uncatch_errors P_ ((Display *, int)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
331 void x_lower_frame P_ ((struct frame *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
332 void x_scroll_bar_clear P_ ((struct frame *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
333 int x_had_errors_p P_ ((Display *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
334 void x_wm_set_size_hint P_ ((struct frame *, long, int)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
335 void x_raise_frame P_ ((struct frame *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
336 void x_set_window_size P_ ((struct frame *, int, int, int)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
337 void x_wm_set_window_state P_ ((struct frame *, int)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
338 void x_wm_set_icon_pixmap P_ ((struct frame *, int)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
339 void x_initialize P_ ((void)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
340 static void x_font_min_bounds P_ ((XFontStruct *, int *, int *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
341 static int x_compute_min_glyph_bounds P_ ((struct frame *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
342 static void x_update_end P_ ((struct frame *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
343 static void XTframe_up_to_date P_ ((struct frame *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
344 static void XTset_terminal_modes P_ ((void)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
345 static void XTreset_terminal_modes P_ ((void)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
346 static void x_clear_frame P_ ((void)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
347 static void frame_highlight P_ ((struct frame *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
348 static void frame_unhighlight P_ ((struct frame *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
349 static void x_new_focus_frame P_ ((struct x_display_info *, struct frame *)); |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
350 static void x_focus_changed P_ ((int, int, struct x_display_info *, |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
351 struct frame *, struct input_event *)); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
352 static void x_detect_focus_change P_ ((struct x_display_info *, |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
353 XEvent *, struct input_event *)); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
354 static void XTframe_rehighlight P_ ((struct frame *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
355 static void x_frame_rehighlight P_ ((struct x_display_info *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
356 static void x_draw_hollow_cursor P_ ((struct window *, struct glyph_row *)); |
|
44690
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
357 static void x_draw_bar_cursor P_ ((struct window *, struct glyph_row *, int, |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
358 enum text_cursor_kinds)); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
359 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
360 static void x_clip_to_row P_ ((struct window *, struct glyph_row *, GC)); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
361 static void x_flush P_ ((struct frame *f)); |
| 30321 | 362 static void x_update_begin P_ ((struct frame *)); |
| 363 static void x_update_window_begin P_ ((struct window *)); | |
| 364 static void x_after_update_window_line P_ ((struct glyph_row *)); | |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
365 static struct scroll_bar *x_window_to_scroll_bar P_ ((Display *, Window)); |
|
36492
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
366 static void x_scroll_bar_report_motion P_ ((struct frame **, Lisp_Object *, |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
367 enum scroll_bar_part *, |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
368 Lisp_Object *, Lisp_Object *, |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
369 unsigned long *)); |
|
42717
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
370 static void x_check_fullscreen P_ ((struct frame *)); |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
371 static void x_check_expected_move P_ ((struct frame *)); |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
372 static int handle_one_xevent P_ ((struct x_display_info *, XEvent *, |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
373 int *, struct input_event *)); |
| 49322 | 374 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
375 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
376 /* Flush display of frame F, or of all frames if F is null. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
377 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
378 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
379 x_flush (f) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
380 struct frame *f; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
381 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
382 BLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
383 if (f == NULL) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
384 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
385 Lisp_Object rest, frame; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
386 FOR_EACH_FRAME (rest, frame) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
387 x_flush (XFRAME (frame)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
388 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
389 else if (FRAME_X_P (f)) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
390 XFlush (FRAME_X_DISPLAY (f)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
391 UNBLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
392 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
393 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
394 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
395 /* Remove calls to XFlush by defining XFlush to an empty replacement. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
396 Calls to XFlush should be unnecessary because the X output buffer |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
397 is flushed automatically as needed by calls to XPending, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
398 XNextEvent, or XWindowEvent according to the XFlush man page. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
399 XTread_socket calls XPending. Removing XFlush improves |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
400 performance. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
401 |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
402 #define XFlush(DISPLAY) (void) 0 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
403 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
404 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
405 /*********************************************************************** |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
406 Debugging |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
407 ***********************************************************************/ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
408 |
|
12192
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
409 #if 0 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
410 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
411 /* This is a function useful for recording debugging information about |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
412 the sequence of occurrences in this file. */ |
|
12192
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
413 |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
414 struct record |
|
12192
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
415 { |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
416 char *locus; |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
417 int type; |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
418 }; |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
419 |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
420 struct record event_record[100]; |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
421 |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
422 int event_record_index; |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
423 |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
424 record_event (locus, type) |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
425 char *locus; |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
426 int type; |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
427 { |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
428 if (event_record_index == sizeof (event_record) / sizeof (struct record)) |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
429 event_record_index = 0; |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
430 |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
431 event_record[event_record_index].locus = locus; |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
432 event_record[event_record_index].type = type; |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
433 event_record_index++; |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
434 } |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
435 |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
436 #endif /* 0 */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
437 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
438 |
|
12192
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
439 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
440 /* Return the struct x_display_info corresponding to DPY. */ |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
441 |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
442 struct x_display_info * |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
443 x_display_info_for_display (dpy) |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
444 Display *dpy; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
445 { |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
446 struct x_display_info *dpyinfo; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
447 |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
448 for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next) |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
449 if (dpyinfo->display == dpy) |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
450 return dpyinfo; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
451 |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
452 return 0; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
453 } |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
454 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
455 |
|
1020
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
456 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
457 /*********************************************************************** |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
458 Starting and ending an update |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
459 ***********************************************************************/ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
460 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
461 /* Start an update of frame F. This function is installed as a hook |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
462 for update_begin, i.e. it is called when update_begin is called. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
463 This function is called prior to calls to x_update_window_begin for |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
464 each window being updated. Currently, there is nothing to do here |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
465 because all interesting stuff is done on a window basis. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
466 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
467 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
468 x_update_begin (f) |
| 771 | 469 struct frame *f; |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
470 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
471 /* Nothing to do. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
472 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
473 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
474 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
475 /* Start update of window W. Set the global variable updated_window |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
476 to the window being updated and set output_cursor to the cursor |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
477 position of W. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
478 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
479 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
480 x_update_window_begin (w) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
481 struct window *w; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
482 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
483 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
484 struct x_display_info *display_info = FRAME_X_DISPLAY_INFO (f); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
485 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
486 updated_window = w; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
487 set_output_cursor (&w->cursor); |
| 286 | 488 |
| 489 BLOCK_INPUT; | |
|
6616
951c8941b931
[INCLUDED_FCNTL]: Don't include fcntl.h again.
Richard M. Stallman <rms@gnu.org>
parents:
6560
diff
changeset
|
490 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
491 if (f == display_info->mouse_face_mouse_frame) |
|
6616
951c8941b931
[INCLUDED_FCNTL]: Don't include fcntl.h again.
Richard M. Stallman <rms@gnu.org>
parents:
6560
diff
changeset
|
492 { |
|
6660
cb14d76e993c
(note_mouse_highlight): Do nothing if gc_in_progress.
Richard M. Stallman <rms@gnu.org>
parents:
6649
diff
changeset
|
493 /* Don't do highlighting for mouse motion during the update. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
494 display_info->mouse_face_defer = 1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
495 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
496 /* If F needs to be redrawn, simply forget about any prior mouse |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
497 highlighting. */ |
|
10274
83aaf59dabbe
(XTupdate_begin): Fix backward test in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
10223
diff
changeset
|
498 if (FRAME_GARBAGED_P (f)) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
499 display_info->mouse_face_window = Qnil; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
500 |
|
30153
1eb41ec71ea5
(x_update_window_begin): No need to turn off the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
30137
diff
changeset
|
501 #if 0 /* Rows in a current matrix containing glyphs in mouse-face have |
|
1eb41ec71ea5
(x_update_window_begin): No need to turn off the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
30137
diff
changeset
|
502 their mouse_face_p flag set, which means that they are always |
|
1eb41ec71ea5
(x_update_window_begin): No need to turn off the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
30137
diff
changeset
|
503 unequal to rows in a desired matrix which never have that |
|
1eb41ec71ea5
(x_update_window_begin): No need to turn off the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
30137
diff
changeset
|
504 flag set. So, rows containing mouse-face glyphs are never |
|
1eb41ec71ea5
(x_update_window_begin): No need to turn off the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
30137
diff
changeset
|
505 scrolled, and we don't have to switch the mouse highlight off |
|
1eb41ec71ea5
(x_update_window_begin): No need to turn off the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
30137
diff
changeset
|
506 here to prevent it from being scrolled. */ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
507 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
508 /* Can we tell that this update does not affect the window |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
509 where the mouse highlight is? If so, no need to turn off. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
510 Likewise, don't do anything if the frame is garbaged; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
511 in that case, the frame's current matrix that we would use |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
512 is all wrong, and we will redisplay that line anyway. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
513 if (!NILP (display_info->mouse_face_window) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
514 && w == XWINDOW (display_info->mouse_face_window)) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
515 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
516 int i; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
517 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
518 for (i = 0; i < w->desired_matrix->nrows; ++i) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
519 if (MATRIX_ROW_ENABLED_P (w->desired_matrix, i)) |
|
6660
cb14d76e993c
(note_mouse_highlight): Do nothing if gc_in_progress.
Richard M. Stallman <rms@gnu.org>
parents:
6649
diff
changeset
|
520 break; |
|
cb14d76e993c
(note_mouse_highlight): Do nothing if gc_in_progress.
Richard M. Stallman <rms@gnu.org>
parents:
6649
diff
changeset
|
521 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
522 if (i < w->desired_matrix->nrows) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
523 clear_mouse_face (display_info); |
|
6660
cb14d76e993c
(note_mouse_highlight): Do nothing if gc_in_progress.
Richard M. Stallman <rms@gnu.org>
parents:
6649
diff
changeset
|
524 } |
|
30153
1eb41ec71ea5
(x_update_window_begin): No need to turn off the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
30137
diff
changeset
|
525 #endif /* 0 */ |
|
6616
951c8941b931
[INCLUDED_FCNTL]: Don't include fcntl.h again.
Richard M. Stallman <rms@gnu.org>
parents:
6560
diff
changeset
|
526 } |
|
8781
98741404d3e0
Delete X11 conditionals.
Richard M. Stallman <rms@gnu.org>
parents:
8724
diff
changeset
|
527 |
| 286 | 528 UNBLOCK_INPUT; |
| 529 } | |
| 530 | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
531 |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
532 /* Draw a vertical window border from (x,y0) to (x,y1) */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
533 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
534 static void |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
535 x_draw_vertical_window_border (w, x, y0, y1) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
536 struct window *w; |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
537 int x, y0, y1; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
538 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
539 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
540 |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
541 XDrawLine (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
542 f->output_data.x->normal_gc, x, y0, x, y1); |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
543 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
544 |
|
30160
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
545 /* End update of window W (which is equal to updated_window). |
|
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
546 |
|
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
547 Draw vertical borders between horizontally adjacent windows, and |
|
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
548 display W's cursor if CURSOR_ON_P is non-zero. |
|
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
549 |
|
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
550 MOUSE_FACE_OVERWRITTEN_P non-zero means that some row containing |
|
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
551 glyphs in mouse-face were overwritten. In that case we have to |
|
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
552 make sure that the mouse-highlight is properly redrawn. |
|
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
553 |
|
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
554 W may be a menu bar pseudo-window in case we don't have X toolkit |
|
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
555 support. Such windows don't have a cursor, so don't display it |
|
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
556 here. */ |
|
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
557 |
|
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
558 static void |
|
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
559 x_update_window_end (w, cursor_on_p, mouse_face_overwritten_p) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
560 struct window *w; |
|
30160
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
561 int cursor_on_p, mouse_face_overwritten_p; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
562 { |
|
36929
9d0ed4b0c89a
(x_update_window_end): Handle overwritten mouse face
Gerd Moellmann <gerd@gnu.org>
parents:
36880
diff
changeset
|
563 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (XFRAME (w->frame)); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
564 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
565 if (!w->pseudo_window_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
566 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
567 BLOCK_INPUT; |
|
30160
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
568 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
569 if (cursor_on_p) |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
570 display_and_set_cursor (w, 1, output_cursor.hpos, |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
571 output_cursor.vpos, |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
572 output_cursor.x, output_cursor.y); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
573 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
574 x_draw_vertical_border (w); |
|
53609
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
575 |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
576 draw_window_fringes (w); |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
577 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
578 UNBLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
579 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
580 |
|
36929
9d0ed4b0c89a
(x_update_window_end): Handle overwritten mouse face
Gerd Moellmann <gerd@gnu.org>
parents:
36880
diff
changeset
|
581 /* If a row with mouse-face was overwritten, arrange for |
|
9d0ed4b0c89a
(x_update_window_end): Handle overwritten mouse face
Gerd Moellmann <gerd@gnu.org>
parents:
36880
diff
changeset
|
582 XTframe_up_to_date to redisplay the mouse highlight. */ |
|
9d0ed4b0c89a
(x_update_window_end): Handle overwritten mouse face
Gerd Moellmann <gerd@gnu.org>
parents:
36880
diff
changeset
|
583 if (mouse_face_overwritten_p) |
|
9d0ed4b0c89a
(x_update_window_end): Handle overwritten mouse face
Gerd Moellmann <gerd@gnu.org>
parents:
36880
diff
changeset
|
584 { |
|
9d0ed4b0c89a
(x_update_window_end): Handle overwritten mouse face
Gerd Moellmann <gerd@gnu.org>
parents:
36880
diff
changeset
|
585 dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1; |
|
9d0ed4b0c89a
(x_update_window_end): Handle overwritten mouse face
Gerd Moellmann <gerd@gnu.org>
parents:
36880
diff
changeset
|
586 dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1; |
|
9d0ed4b0c89a
(x_update_window_end): Handle overwritten mouse face
Gerd Moellmann <gerd@gnu.org>
parents:
36880
diff
changeset
|
587 dpyinfo->mouse_face_window = Qnil; |
|
9d0ed4b0c89a
(x_update_window_end): Handle overwritten mouse face
Gerd Moellmann <gerd@gnu.org>
parents:
36880
diff
changeset
|
588 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
589 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
590 updated_window = NULL; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
591 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
592 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
593 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
594 /* End update of frame F. This function is installed as a hook in |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
595 update_end. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
596 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
597 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
598 x_update_end (f) |
| 771 | 599 struct frame *f; |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
600 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
601 /* Mouse highlight may be displayed again. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
602 FRAME_X_DISPLAY_INFO (f)->mouse_face_defer = 0; |
| 286 | 603 |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
604 #ifndef XFlush |
| 286 | 605 BLOCK_INPUT; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
606 XFlush (FRAME_X_DISPLAY (f)); |
| 286 | 607 UNBLOCK_INPUT; |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
608 #endif |
| 286 | 609 } |
|
6616
951c8941b931
[INCLUDED_FCNTL]: Don't include fcntl.h again.
Richard M. Stallman <rms@gnu.org>
parents:
6560
diff
changeset
|
610 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
611 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
612 /* This function is called from various places in xdisp.c whenever a |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
613 complete update has been performed. The global variable |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
614 updated_window is not available here. */ |
|
6616
951c8941b931
[INCLUDED_FCNTL]: Don't include fcntl.h again.
Richard M. Stallman <rms@gnu.org>
parents:
6560
diff
changeset
|
615 |
| 21514 | 616 static void |
|
6616
951c8941b931
[INCLUDED_FCNTL]: Don't include fcntl.h again.
Richard M. Stallman <rms@gnu.org>
parents:
6560
diff
changeset
|
617 XTframe_up_to_date (f) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
618 struct frame *f; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
619 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
620 if (FRAME_X_P (f)) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
621 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
622 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
30160
432da5a9f734
(x_update_window_end): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents:
30153
diff
changeset
|
623 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
624 if (dpyinfo->mouse_face_deferred_gc |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
625 || f == dpyinfo->mouse_face_mouse_frame) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
626 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
627 BLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
628 if (dpyinfo->mouse_face_mouse_frame) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
629 note_mouse_highlight (dpyinfo->mouse_face_mouse_frame, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
630 dpyinfo->mouse_face_mouse_x, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
631 dpyinfo->mouse_face_mouse_y); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
632 dpyinfo->mouse_face_deferred_gc = 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
633 UNBLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
634 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
635 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
636 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
637 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
638 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
639 /* Draw truncation mark bitmaps, continuation mark bitmaps, overlay |
| 41134 | 640 arrow bitmaps, or clear the fringes if no bitmaps are required |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
641 before DESIRED_ROW is made current. The window being updated is |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
642 found in updated_window. This function It is called from |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
643 update_window_line only if it is known that there are differences |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
644 between bitmaps to be drawn between current row and DESIRED_ROW. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
645 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
646 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
647 x_after_update_window_line (desired_row) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
648 struct glyph_row *desired_row; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
649 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
650 struct window *w = updated_window; |
|
40435
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
651 struct frame *f; |
|
40514
a4363606beb1
(x_after_update_window_line): Don't run the code
Gerd Moellmann <gerd@gnu.org>
parents:
40499
diff
changeset
|
652 int width, height; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
653 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
654 xassert (w); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
655 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
656 if (!desired_row->mode_line_p && !w->pseudo_window_p) |
|
53609
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
657 desired_row->redraw_fringe_bitmaps_p = 1; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
658 |
|
40435
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
659 /* When a window has disappeared, make sure that no rest of |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
660 full-width rows stays visible in the internal border. Could |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
661 check here if updated_window is the leftmost/rightmost window, |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
662 but I guess it's not worth doing since vertically split windows |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
663 are almost never used, internal border is rarely set, and the |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
664 overhead is very small. */ |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
665 if (windows_or_buffers_changed |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
666 && desired_row->full_width_p |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
667 && (f = XFRAME (w->frame), |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
668 width = FRAME_INTERNAL_BORDER_WIDTH (f), |
|
40514
a4363606beb1
(x_after_update_window_line): Don't run the code
Gerd Moellmann <gerd@gnu.org>
parents:
40499
diff
changeset
|
669 width != 0) |
|
a4363606beb1
(x_after_update_window_line): Don't run the code
Gerd Moellmann <gerd@gnu.org>
parents:
40499
diff
changeset
|
670 && (height = desired_row->visible_height, |
|
a4363606beb1
(x_after_update_window_line): Don't run the code
Gerd Moellmann <gerd@gnu.org>
parents:
40499
diff
changeset
|
671 height > 0)) |
|
a4363606beb1
(x_after_update_window_line): Don't run the code
Gerd Moellmann <gerd@gnu.org>
parents:
40499
diff
changeset
|
672 { |
|
40435
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
673 int y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, desired_row->y)); |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
674 |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
675 /* Internal border is drawn below the tool bar. */ |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
676 if (WINDOWP (f->tool_bar_window) |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
677 && w == XWINDOW (f->tool_bar_window)) |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
678 y -= width; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
679 |
|
40435
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
680 BLOCK_INPUT; |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
681 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
682 0, y, width, height, False); |
|
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
683 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
684 FRAME_PIXEL_WIDTH (f) - width, |
|
40435
b23a0899363f
(x_after_update_window_line): Clear internal border
Gerd Moellmann <gerd@gnu.org>
parents:
40433
diff
changeset
|
685 y, width, height, False); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
686 UNBLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
687 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
688 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
689 |
| 50097 | 690 static void |
| 691 x_draw_fringe_bitmap (w, row, p) | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
692 struct window *w; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
693 struct glyph_row *row; |
| 50097 | 694 struct draw_fringe_bitmap_params *p; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
695 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
696 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
697 Display *display = FRAME_X_DISPLAY (f); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
698 Window window = FRAME_X_WINDOW (f); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
699 GC gc = f->output_data.x->normal_gc; |
| 50097 | 700 struct face *face = p->face; |
|
53609
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
701 int rowY; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
702 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
703 /* Must clip because of partially visible lines. */ |
|
53609
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
704 rowY = WINDOW_TO_FRAME_PIXEL_Y (w, row->y); |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
705 if (p->y < rowY) |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
706 { |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
707 /* Adjust position of "bottom aligned" bitmap on partially |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
708 visible last row. */ |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
709 int oldY = row->y; |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
710 int oldVH = row->visible_height; |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
711 row->visible_height = p->h; |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
712 row->y -= rowY - p->y; |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
713 x_clip_to_row (w, row, gc); |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
714 row->y = oldY; |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
715 row->visible_height = oldVH; |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
716 } |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
717 else |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
718 x_clip_to_row (w, row, gc); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
719 |
|
53888
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
720 if (p->bx >= 0 && !p->overlay_p) |
| 50097 | 721 { |
|
41721
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
722 /* In case the same realized face is used for fringes and |
|
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
723 for something displayed in the text (e.g. face `region' on |
|
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
724 mono-displays, the fill style may have been changed to |
|
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
725 FillSolid in x_draw_glyph_string_background. */ |
|
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
726 if (face->stipple) |
|
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
727 XSetFillStyle (display, face->gc, FillOpaqueStippled); |
|
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
728 else |
|
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
729 XSetForeground (display, face->gc, face->background); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
730 |
|
41721
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
731 XFillRectangle (display, window, face->gc, |
| 50097 | 732 p->bx, p->by, p->nx, p->ny); |
| 733 | |
|
41721
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
734 if (!face->stipple) |
|
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
735 XSetForeground (display, face->gc, face->foreground); |
|
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
736 } |
|
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
737 |
|
53888
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
738 if (p->which) |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
739 { |
|
53933
869ca316cdda
(x_draw_fringe_bitmap): Handle wider bitmaps (max 16 bits).
Kim F. Storm <storm@cua.dk>
parents:
53888
diff
changeset
|
740 unsigned char *bits; |
|
53888
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
741 Pixmap pixmap, clipmask = (Pixmap) 0; |
| 50097 | 742 int depth = DefaultDepthOfScreen (FRAME_X_SCREEN (f)); |
|
53888
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
743 XGCValues gcv; |
| 50097 | 744 |
|
53933
869ca316cdda
(x_draw_fringe_bitmap): Handle wider bitmaps (max 16 bits).
Kim F. Storm <storm@cua.dk>
parents:
53888
diff
changeset
|
745 if (p->wd > 8) |
|
869ca316cdda
(x_draw_fringe_bitmap): Handle wider bitmaps (max 16 bits).
Kim F. Storm <storm@cua.dk>
parents:
53888
diff
changeset
|
746 bits = (unsigned char *)(p->bits + p->dh); |
|
869ca316cdda
(x_draw_fringe_bitmap): Handle wider bitmaps (max 16 bits).
Kim F. Storm <storm@cua.dk>
parents:
53888
diff
changeset
|
747 else |
|
869ca316cdda
(x_draw_fringe_bitmap): Handle wider bitmaps (max 16 bits).
Kim F. Storm <storm@cua.dk>
parents:
53888
diff
changeset
|
748 bits = (unsigned char *)p->bits + p->dh; |
|
869ca316cdda
(x_draw_fringe_bitmap): Handle wider bitmaps (max 16 bits).
Kim F. Storm <storm@cua.dk>
parents:
53888
diff
changeset
|
749 |
|
41741
c0edacaaaea8
(x_draw_fringe_bitmap): Always undo clipping.
Gerd Moellmann <gerd@gnu.org>
parents:
41721
diff
changeset
|
750 /* Draw the bitmap. I believe these small pixmaps can be cached |
|
c0edacaaaea8
(x_draw_fringe_bitmap): Always undo clipping.
Gerd Moellmann <gerd@gnu.org>
parents:
41721
diff
changeset
|
751 by the server. */ |
| 50097 | 752 pixmap = XCreatePixmapFromBitmapData (display, window, bits, p->wd, p->h, |
|
53888
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
753 (p->cursor_p |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
754 ? (p->overlay_p ? face->background |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
755 : f->output_data.x->cursor_pixel) |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
756 : face->foreground), |
|
41741
c0edacaaaea8
(x_draw_fringe_bitmap): Always undo clipping.
Gerd Moellmann <gerd@gnu.org>
parents:
41721
diff
changeset
|
757 face->background, depth); |
|
53888
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
758 |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
759 if (p->overlay_p) |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
760 { |
|
54650
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
761 clipmask = XCreatePixmapFromBitmapData (display, |
|
53888
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
762 FRAME_X_DISPLAY_INFO (f)->root_window, |
|
54650
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
763 bits, p->wd, p->h, |
|
53888
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
764 1, 0, 1); |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
765 gcv.clip_mask = clipmask; |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
766 gcv.clip_x_origin = p->x; |
|
54650
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
767 gcv.clip_y_origin = p->y; |
|
53888
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
768 XChangeGC (display, gc, GCClipMask | GCClipXOrigin | GCClipYOrigin, &gcv); |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
769 } |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
770 |
| 50097 | 771 XCopyArea (display, pixmap, window, gc, 0, 0, |
| 772 p->wd, p->h, p->x, p->y); | |
|
41741
c0edacaaaea8
(x_draw_fringe_bitmap): Always undo clipping.
Gerd Moellmann <gerd@gnu.org>
parents:
41721
diff
changeset
|
773 XFreePixmap (display, pixmap); |
|
53888
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
774 |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
775 if (p->overlay_p) |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
776 { |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
777 gcv.clip_mask = (Pixmap) 0; |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
778 XChangeGC (display, gc, GCClipMask, &gcv); |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
779 XFreePixmap (display, clipmask); |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
780 } |
|
41741
c0edacaaaea8
(x_draw_fringe_bitmap): Always undo clipping.
Gerd Moellmann <gerd@gnu.org>
parents:
41721
diff
changeset
|
781 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
782 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
783 XSetClipMask (display, gc, None); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
784 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
785 |
| 286 | 786 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
787 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
788 /* This is called when starting Emacs and when restarting after |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
789 suspend. When starting Emacs, no X window is mapped. And nothing |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
790 must be done to Emacs's own window if it is suspended (though that |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
791 rarely happens). */ |
| 286 | 792 |
| 21514 | 793 static void |
| 286 | 794 XTset_terminal_modes () |
| 795 { | |
| 796 } | |
| 797 | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
798 /* This is called when exiting or suspending Emacs. Exiting will make |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
799 the X-windows go away, and suspending requires no action. */ |
| 286 | 800 |
| 21514 | 801 static void |
| 286 | 802 XTreset_terminal_modes () |
| 803 { | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
804 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
805 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
806 |
| 286 | 807 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
808 /*********************************************************************** |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
809 Display Iterator |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
810 ***********************************************************************/ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
811 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
812 /* Function prototypes of this page. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
813 |
|
50151
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
814 static int x_encode_char P_ ((int, XChar2b *, struct font_info *, int *)); |
|
28231
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
815 |
|
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
816 |
|
27974
d443ad369a18
(PER_CHAR_METRIC): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
27967
diff
changeset
|
817 /* Get metrics of character CHAR2B in FONT. Value is null if CHAR2B |
|
d443ad369a18
(PER_CHAR_METRIC): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
27967
diff
changeset
|
818 is not contained in the font. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
819 |
|
50151
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
820 static XCharStruct * |
|
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
821 x_per_char_metric (font, char2b, font_type) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
822 XFontStruct *font; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
823 XChar2b *char2b; |
|
50151
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
824 int font_type; /* unused on X */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
825 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
826 /* The result metric information. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
827 XCharStruct *pcm = NULL; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
828 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
829 xassert (font && char2b); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
830 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
831 if (font->per_char != NULL) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
832 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
833 if (font->min_byte1 == 0 && font->max_byte1 == 0) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
834 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
835 /* min_char_or_byte2 specifies the linear character index |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
836 corresponding to the first element of the per_char array, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
837 max_char_or_byte2 is the index of the last character. A |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
838 character with non-zero CHAR2B->byte1 is not in the font. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
839 A character with byte2 less than min_char_or_byte2 or |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
840 greater max_char_or_byte2 is not in the font. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
841 if (char2b->byte1 == 0 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
842 && char2b->byte2 >= font->min_char_or_byte2 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
843 && char2b->byte2 <= font->max_char_or_byte2) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
844 pcm = font->per_char + char2b->byte2 - font->min_char_or_byte2; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
845 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
846 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
847 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
848 /* If either min_byte1 or max_byte1 are nonzero, both |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
849 min_char_or_byte2 and max_char_or_byte2 are less than |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
850 256, and the 2-byte character index values corresponding |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
851 to the per_char array element N (counting from 0) are: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
852 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
853 byte1 = N/D + min_byte1 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
854 byte2 = N\D + min_char_or_byte2 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
855 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
856 where: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
857 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
858 D = max_char_or_byte2 - min_char_or_byte2 + 1 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
859 / = integer division |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
860 \ = integer modulus */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
861 if (char2b->byte1 >= font->min_byte1 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
862 && char2b->byte1 <= font->max_byte1 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
863 && char2b->byte2 >= font->min_char_or_byte2 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
864 && char2b->byte2 <= font->max_char_or_byte2) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
865 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
866 pcm = (font->per_char |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
867 + ((font->max_char_or_byte2 - font->min_char_or_byte2 + 1) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
868 * (char2b->byte1 - font->min_byte1)) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
869 + (char2b->byte2 - font->min_char_or_byte2)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
870 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
871 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
872 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
873 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
874 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
875 /* If the per_char pointer is null, all glyphs between the first |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
876 and last character indexes inclusive have the same |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
877 information, as given by both min_bounds and max_bounds. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
878 if (char2b->byte2 >= font->min_char_or_byte2 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
879 && char2b->byte2 <= font->max_char_or_byte2) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
880 pcm = &font->max_bounds; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
881 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
882 |
|
28231
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
883 return ((pcm == NULL |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
884 || (pcm->width == 0 && (pcm->rbearing - pcm->lbearing) == 0)) |
|
28231
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
885 ? NULL : pcm); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
886 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
887 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
888 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
889 /* Encode CHAR2B using encoding information from FONT_INFO. CHAR2B is |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
890 the two-byte form of C. Encoding is returned in *CHAR2B. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
891 |
|
50151
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
892 static int |
|
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
893 x_encode_char (c, char2b, font_info, two_byte_p) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
894 int c; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
895 XChar2b *char2b; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
896 struct font_info *font_info; |
|
50151
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
897 int *two_byte_p; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
898 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
899 int charset = CHAR_CHARSET (c); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
900 XFontStruct *font = font_info->font; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
901 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
902 /* FONT_INFO may define a scheme by which to encode byte1 and byte2. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
903 This may be either a program in a special encoder language or a |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
904 fixed encoding. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
905 if (font_info->font_encoder) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
906 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
907 /* It's a program. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
908 struct ccl_program *ccl = font_info->font_encoder; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
909 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
910 if (CHARSET_DIMENSION (charset) == 1) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
911 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
912 ccl->reg[0] = charset; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
913 ccl->reg[1] = char2b->byte2; |
|
47699
a8e563d6dbb3
(x_encode_char): For DIM=1 charset, set ccl->reg[2] to
Kenichi Handa <handa@m17n.org>
parents:
47143
diff
changeset
|
914 ccl->reg[2] = -1; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
915 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
916 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
917 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
918 ccl->reg[0] = charset; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
919 ccl->reg[1] = char2b->byte1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
920 ccl->reg[2] = char2b->byte2; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
921 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
922 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
923 ccl_driver (ccl, NULL, NULL, 0, 0, NULL); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
924 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
925 /* We assume that MSBs are appropriately set/reset by CCL |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
926 program. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
927 if (font->max_byte1 == 0) /* 1-byte font */ |
|
28231
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
928 char2b->byte1 = 0, char2b->byte2 = ccl->reg[1]; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
929 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
930 char2b->byte1 = ccl->reg[1], char2b->byte2 = ccl->reg[2]; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
931 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
932 else if (font_info->encoding[charset]) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
933 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
934 /* Fixed encoding scheme. See fontset.h for the meaning of the |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
935 encoding numbers. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
936 int enc = font_info->encoding[charset]; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
937 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
938 if ((enc == 1 || enc == 2) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
939 && CHARSET_DIMENSION (charset) == 2) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
940 char2b->byte1 |= 0x80; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
941 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
942 if (enc == 1 || enc == 3) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
943 char2b->byte2 |= 0x80; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
944 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
945 |
|
28231
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
946 if (two_byte_p) |
|
50151
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
947 *two_byte_p = ((XFontStruct *) (font_info->font))->max_byte1 > 0; |
|
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
948 |
|
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
949 return FONT_TYPE_UNKNOWN; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
950 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
951 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
952 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
953 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
954 /*********************************************************************** |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
955 Glyph display |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
956 ***********************************************************************/ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
957 |
|
50151
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
958 |
|
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
959 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
960 static void x_set_glyph_string_clipping P_ ((struct glyph_string *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
961 static void x_set_glyph_string_gc P_ ((struct glyph_string *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
962 static void x_draw_glyph_string_background P_ ((struct glyph_string *, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
963 int)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
964 static void x_draw_glyph_string_foreground P_ ((struct glyph_string *)); |
|
26879
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
965 static void x_draw_composite_glyph_string_foreground P_ ((struct glyph_string *)); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
966 static void x_draw_glyph_string_box P_ ((struct glyph_string *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
967 static void x_draw_glyph_string P_ ((struct glyph_string *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
968 static void x_compute_glyph_string_overhangs P_ ((struct glyph_string *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
969 static void x_set_cursor_gc P_ ((struct glyph_string *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
970 static void x_set_mode_line_face_gc P_ ((struct glyph_string *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
971 static void x_set_mouse_face_gc P_ ((struct glyph_string *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
972 static int x_alloc_lighter_color P_ ((struct frame *, Display *, Colormap, |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25921
diff
changeset
|
973 unsigned long *, double, int)); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
974 static void x_setup_relief_color P_ ((struct frame *, struct relief *, |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25921
diff
changeset
|
975 double, int, unsigned long)); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
976 static void x_setup_relief_colors P_ ((struct glyph_string *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
977 static void x_draw_image_glyph_string P_ ((struct glyph_string *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
978 static void x_draw_image_relief P_ ((struct glyph_string *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
979 static void x_draw_image_foreground P_ ((struct glyph_string *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
980 static void x_draw_image_foreground_1 P_ ((struct glyph_string *, Pixmap)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
981 static void x_clear_glyph_string_rect P_ ((struct glyph_string *, int, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
982 int, int, int)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
983 static void x_draw_relief_rect P_ ((struct frame *, int, int, int, int, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
984 int, int, int, int, XRectangle *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
985 static void x_draw_box_rect P_ ((struct glyph_string *, int, int, int, int, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
986 int, int, int, XRectangle *)); |
|
25189
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
987 |
|
29619
d171b4754825
(x_check_font) [GLYPH_DEBUG]: Add prototype.
Gerd Moellmann <gerd@gnu.org>
parents:
29600
diff
changeset
|
988 #if GLYPH_DEBUG |
|
d171b4754825
(x_check_font) [GLYPH_DEBUG]: Add prototype.
Gerd Moellmann <gerd@gnu.org>
parents:
29600
diff
changeset
|
989 static void x_check_font P_ ((struct frame *, XFontStruct *)); |
|
d171b4754825
(x_check_font) [GLYPH_DEBUG]: Add prototype.
Gerd Moellmann <gerd@gnu.org>
parents:
29600
diff
changeset
|
990 #endif |
|
d171b4754825
(x_check_font) [GLYPH_DEBUG]: Add prototype.
Gerd Moellmann <gerd@gnu.org>
parents:
29600
diff
changeset
|
991 |
|
25189
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
992 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
993 /* Set S->gc to a suitable GC for drawing glyph string S in cursor |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
994 face. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
995 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
996 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
997 x_set_cursor_gc (s) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
998 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
999 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1000 if (s->font == FRAME_FONT (s->f) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1001 && s->face->background == FRAME_BACKGROUND_PIXEL (s->f) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1002 && s->face->foreground == FRAME_FOREGROUND_PIXEL (s->f) |
|
26879
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1003 && !s->cmp) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1004 s->gc = s->f->output_data.x->cursor_gc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1005 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1006 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1007 /* Cursor on non-default face: must merge. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1008 XGCValues xgcv; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1009 unsigned long mask; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1010 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1011 xgcv.background = s->f->output_data.x->cursor_pixel; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1012 xgcv.foreground = s->face->background; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1013 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1014 /* If the glyph would be invisible, try a different foreground. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1015 if (xgcv.foreground == xgcv.background) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1016 xgcv.foreground = s->face->foreground; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1017 if (xgcv.foreground == xgcv.background) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1018 xgcv.foreground = s->f->output_data.x->cursor_foreground_pixel; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1019 if (xgcv.foreground == xgcv.background) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1020 xgcv.foreground = s->face->foreground; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1021 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1022 /* Make sure the cursor is distinct from text in this face. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1023 if (xgcv.background == s->face->background |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1024 && xgcv.foreground == s->face->foreground) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1025 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1026 xgcv.background = s->face->foreground; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1027 xgcv.foreground = s->face->background; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1028 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1029 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1030 IF_DEBUG (x_check_font (s->f, s->font)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1031 xgcv.font = s->font->fid; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1032 xgcv.graphics_exposures = False; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1033 mask = GCForeground | GCBackground | GCFont | GCGraphicsExposures; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1034 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1035 if (FRAME_X_DISPLAY_INFO (s->f)->scratch_cursor_gc) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1036 XChangeGC (s->display, FRAME_X_DISPLAY_INFO (s->f)->scratch_cursor_gc, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1037 mask, &xgcv); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1038 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1039 FRAME_X_DISPLAY_INFO (s->f)->scratch_cursor_gc |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1040 = XCreateGC (s->display, s->window, mask, &xgcv); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1041 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1042 s->gc = FRAME_X_DISPLAY_INFO (s->f)->scratch_cursor_gc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1043 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1044 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1045 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1046 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1047 /* Set up S->gc of glyph string S for drawing text in mouse face. */ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1048 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1049 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1050 x_set_mouse_face_gc (s) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1051 struct glyph_string *s; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1052 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1053 int face_id; |
|
28231
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
1054 struct face *face; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1055 |
|
35315
1f5511b1d5ea
(x_set_mouse_face_gc): If the last use mouse face
Gerd Moellmann <gerd@gnu.org>
parents:
35309
diff
changeset
|
1056 /* What face has to be used last for the mouse face? */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1057 face_id = FRAME_X_DISPLAY_INFO (s->f)->mouse_face_face_id; |
|
28231
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
1058 face = FACE_FROM_ID (s->f, face_id); |
|
35315
1f5511b1d5ea
(x_set_mouse_face_gc): If the last use mouse face
Gerd Moellmann <gerd@gnu.org>
parents:
35309
diff
changeset
|
1059 if (face == NULL) |
|
1f5511b1d5ea
(x_set_mouse_face_gc): If the last use mouse face
Gerd Moellmann <gerd@gnu.org>
parents:
35309
diff
changeset
|
1060 face = FACE_FROM_ID (s->f, MOUSE_FACE_ID); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1061 |
|
29393
3ad9354ade23
(x_set_mouse_face_gc): If first glyph isn't a character
Gerd Moellmann <gerd@gnu.org>
parents:
28793
diff
changeset
|
1062 if (s->first_glyph->type == CHAR_GLYPH) |
|
3ad9354ade23
(x_set_mouse_face_gc): If first glyph isn't a character
Gerd Moellmann <gerd@gnu.org>
parents:
28793
diff
changeset
|
1063 face_id = FACE_FOR_CHAR (s->f, face, s->first_glyph->u.ch); |
|
3ad9354ade23
(x_set_mouse_face_gc): If first glyph isn't a character
Gerd Moellmann <gerd@gnu.org>
parents:
28793
diff
changeset
|
1064 else |
|
3ad9354ade23
(x_set_mouse_face_gc): If first glyph isn't a character
Gerd Moellmann <gerd@gnu.org>
parents:
28793
diff
changeset
|
1065 face_id = FACE_FOR_CHAR (s->f, face, 0); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1066 s->face = FACE_FROM_ID (s->f, face_id); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1067 PREPARE_FACE_FOR_DISPLAY (s->f, s->face); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1068 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1069 /* If font in this face is same as S->font, use it. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1070 if (s->font == s->face->font) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1071 s->gc = s->face->gc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1072 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1073 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1074 /* Otherwise construct scratch_cursor_gc with values from FACE |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1075 but font FONT. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1076 XGCValues xgcv; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1077 unsigned long mask; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1078 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1079 xgcv.background = s->face->background; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1080 xgcv.foreground = s->face->foreground; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1081 IF_DEBUG (x_check_font (s->f, s->font)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1082 xgcv.font = s->font->fid; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1083 xgcv.graphics_exposures = False; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1084 mask = GCForeground | GCBackground | GCFont | GCGraphicsExposures; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1085 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1086 if (FRAME_X_DISPLAY_INFO (s->f)->scratch_cursor_gc) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1087 XChangeGC (s->display, FRAME_X_DISPLAY_INFO (s->f)->scratch_cursor_gc, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1088 mask, &xgcv); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1089 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1090 FRAME_X_DISPLAY_INFO (s->f)->scratch_cursor_gc |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1091 = XCreateGC (s->display, s->window, mask, &xgcv); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1092 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1093 s->gc = FRAME_X_DISPLAY_INFO (s->f)->scratch_cursor_gc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1094 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1095 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1096 xassert (s->gc != 0); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1097 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1098 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1099 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1100 /* Set S->gc of glyph string S to a GC suitable for drawing a mode line. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1101 Faces to use in the mode line have already been computed when the |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1102 matrix was built, so there isn't much to do, here. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1103 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1104 static INLINE void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1105 x_set_mode_line_face_gc (s) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1106 struct glyph_string *s; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1107 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1108 s->gc = s->face->gc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1109 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1110 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1111 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1112 /* Set S->gc of glyph string S for drawing that glyph string. Set |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1113 S->stippled_p to a non-zero value if the face of S has a stipple |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1114 pattern. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1115 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1116 static INLINE void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1117 x_set_glyph_string_gc (s) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1118 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1119 { |
|
30137
4a3808257cf4
(x_fill_stretch_glyph_string): Consume runs of stretch
Gerd Moellmann <gerd@gnu.org>
parents:
30083
diff
changeset
|
1120 PREPARE_FACE_FOR_DISPLAY (s->f, s->face); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1121 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1122 if (s->hl == DRAW_NORMAL_TEXT) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1123 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1124 s->gc = s->face->gc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1125 s->stippled_p = s->face->stipple != 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1126 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1127 else if (s->hl == DRAW_INVERSE_VIDEO) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1128 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1129 x_set_mode_line_face_gc (s); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1130 s->stippled_p = s->face->stipple != 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1131 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1132 else if (s->hl == DRAW_CURSOR) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1133 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1134 x_set_cursor_gc (s); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1135 s->stippled_p = 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1136 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1137 else if (s->hl == DRAW_MOUSE_FACE) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1138 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1139 x_set_mouse_face_gc (s); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1140 s->stippled_p = s->face->stipple != 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1141 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1142 else if (s->hl == DRAW_IMAGE_RAISED |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1143 || s->hl == DRAW_IMAGE_SUNKEN) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1144 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1145 s->gc = s->face->gc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1146 s->stippled_p = s->face->stipple != 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1147 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1148 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1149 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1150 s->gc = s->face->gc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1151 s->stippled_p = s->face->stipple != 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1152 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1153 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1154 /* GC must have been set. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1155 xassert (s->gc != 0); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1156 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1157 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1158 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1159 /* Set clipping for output of glyph string S. S may be part of a mode |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1160 line or menu if we don't have X toolkit support. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1161 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1162 static INLINE void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1163 x_set_glyph_string_clipping (s) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1164 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1165 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1166 XRectangle r; |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
1167 get_glyph_string_clip_rect (s, &r); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1168 XSetClipRectangles (s->display, s->gc, 0, 0, &r, 1, Unsorted); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1169 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1170 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1171 |
|
50151
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
1172 /* RIF: |
|
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
1173 Compute left and right overhang of glyph string S. If S is a glyph |
|
26879
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1174 string for a composition, assume overhangs don't exist. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1175 |
|
50151
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
1176 static void |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1177 x_compute_glyph_string_overhangs (s) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1178 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1179 { |
|
26879
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1180 if (s->cmp == NULL |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1181 && s->first_glyph->type == CHAR_GLYPH) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1182 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1183 XCharStruct cs; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1184 int direction, font_ascent, font_descent; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1185 XTextExtents16 (s->font, s->char2b, s->nchars, &direction, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1186 &font_ascent, &font_descent, &cs); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1187 s->right_overhang = cs.rbearing > cs.width ? cs.rbearing - cs.width : 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1188 s->left_overhang = cs.lbearing < 0 ? -cs.lbearing : 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1189 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1190 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1191 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1192 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1193 /* Fill rectangle X, Y, W, H with background color of glyph string S. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1194 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1195 static INLINE void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1196 x_clear_glyph_string_rect (s, x, y, w, h) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1197 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1198 int x, y, w, h; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1199 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1200 XGCValues xgcv; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1201 XGetGCValues (s->display, s->gc, GCForeground | GCBackground, &xgcv); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1202 XSetForeground (s->display, s->gc, xgcv.background); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1203 XFillRectangle (s->display, s->window, s->gc, x, y, w, h); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1204 XSetForeground (s->display, s->gc, xgcv.foreground); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1205 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1206 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1207 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1208 /* Draw the background of glyph_string S. If S->background_filled_p |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1209 is non-zero don't draw it. FORCE_P non-zero means draw the |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1210 background even if it wouldn't be drawn normally. This is used |
|
26879
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1211 when a string preceding S draws into the background of S, or S |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1212 contains the first component of a composition. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1213 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1214 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1215 x_draw_glyph_string_background (s, force_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1216 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1217 int force_p; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1218 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1219 /* Nothing to do if background has already been drawn or if it |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1220 shouldn't be drawn in the first place. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1221 if (!s->background_filled_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1222 { |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
1223 int box_line_width = max (s->face->box_line_width, 0); |
|
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
1224 |
|
26879
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1225 if (s->stippled_p) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1226 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1227 /* Fill background with a stipple pattern. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1228 XSetFillStyle (s->display, s->gc, FillOpaqueStippled); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1229 XFillRectangle (s->display, s->window, s->gc, s->x, |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
1230 s->y + box_line_width, |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1231 s->background_width, |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
1232 s->height - 2 * box_line_width); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1233 XSetFillStyle (s->display, s->gc, FillSolid); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1234 s->background_filled_p = 1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1235 } |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
1236 else if (FONT_HEIGHT (s->font) < s->height - 2 * box_line_width |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1237 || s->font_not_found_p |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1238 || s->extends_to_end_of_line_p |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1239 || force_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1240 { |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
1241 x_clear_glyph_string_rect (s, s->x, s->y + box_line_width, |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1242 s->background_width, |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
1243 s->height - 2 * box_line_width); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1244 s->background_filled_p = 1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1245 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1246 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1247 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1248 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1249 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1250 /* Draw the foreground of glyph string S. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1251 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1252 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1253 x_draw_glyph_string_foreground (s) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1254 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1255 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1256 int i, x; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1257 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1258 /* If first glyph of S has a left box line, start drawing the text |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1259 of S to the right of that box line. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1260 if (s->face->box != FACE_NO_BOX |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1261 && s->first_glyph->left_box_line_p) |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
1262 x = s->x + abs (s->face->box_line_width); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1263 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1264 x = s->x; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1265 |
|
26879
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1266 /* Draw characters of S as rectangles if S's font could not be |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1267 loaded. */ |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1268 if (s->font_not_found_p) |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1269 { |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1270 for (i = 0; i < s->nchars; ++i) |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1271 { |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1272 struct glyph *g = s->first_glyph + i; |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1273 XDrawRectangle (s->display, s->window, |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1274 s->gc, x, s->y, g->pixel_width - 1, |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1275 s->height - 1); |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1276 x += g->pixel_width; |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1277 } |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1278 } |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1279 else |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1280 { |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1281 char *char1b = (char *) s->char2b; |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1282 int boff = s->font_info->baseline_offset; |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1283 |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1284 if (s->font_info->vertical_centering) |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1285 boff = VCENTER_BASELINE_OFFSET (s->font, s->f) - boff; |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1286 |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1287 /* If we can use 8-bit functions, condense S->char2b. */ |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1288 if (!s->two_byte_p) |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1289 for (i = 0; i < s->nchars; ++i) |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1290 char1b[i] = s->char2b[i].byte2; |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1291 |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1292 /* Draw text with XDrawString if background has already been |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1293 filled. Otherwise, use XDrawImageString. (Note that |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1294 XDrawImageString is usually faster than XDrawString.) Always |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1295 use XDrawImageString when drawing the cursor so that there is |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1296 no chance that characters under a box cursor are invisible. */ |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1297 if (s->for_overlaps_p |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1298 || (s->background_filled_p && s->hl != DRAW_CURSOR)) |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1299 { |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1300 /* Draw characters with 16-bit or 8-bit functions. */ |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1301 if (s->two_byte_p) |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1302 XDrawString16 (s->display, s->window, s->gc, x, |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1303 s->ybase - boff, s->char2b, s->nchars); |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1304 else |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1305 XDrawString (s->display, s->window, s->gc, x, |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1306 s->ybase - boff, char1b, s->nchars); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1307 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1308 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1309 { |
|
26879
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1310 if (s->two_byte_p) |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1311 XDrawImageString16 (s->display, s->window, s->gc, x, |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1312 s->ybase - boff, s->char2b, s->nchars); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
1313 else |
|
26879
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1314 XDrawImageString (s->display, s->window, s->gc, x, |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1315 s->ybase - boff, char1b, s->nchars); |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1316 } |
|
48383
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1317 |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1318 if (s->face->overstrike) |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1319 { |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1320 /* For overstriking (to simulate bold-face), draw the |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1321 characters again shifted to the right by one pixel. */ |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1322 if (s->two_byte_p) |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1323 XDrawString16 (s->display, s->window, s->gc, x + 1, |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1324 s->ybase - boff, s->char2b, s->nchars); |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1325 else |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1326 XDrawString (s->display, s->window, s->gc, x + 1, |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1327 s->ybase - boff, char1b, s->nchars); |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1328 } |
|
26879
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1329 } |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1330 } |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1331 |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1332 /* Draw the foreground of composite glyph string S. */ |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1333 |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1334 static void |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1335 x_draw_composite_glyph_string_foreground (s) |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1336 struct glyph_string *s; |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1337 { |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1338 int i, x; |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1339 |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1340 /* If first glyph of S has a left box line, start drawing the text |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1341 of S to the right of that box line. */ |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1342 if (s->face->box != FACE_NO_BOX |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1343 && s->first_glyph->left_box_line_p) |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
1344 x = s->x + abs (s->face->box_line_width); |
|
26879
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1345 else |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1346 x = s->x; |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1347 |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1348 /* S is a glyph string for a composition. S->gidx is the index of |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1349 the first character drawn for glyphs of this composition. |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1350 S->gidx == 0 means we are drawing the very first character of |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1351 this composition. */ |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1352 |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1353 /* Draw a rectangle for the composition if the font for the very |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1354 first character of the composition could not be loaded. */ |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1355 if (s->font_not_found_p) |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1356 { |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1357 if (s->gidx == 0) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1358 XDrawRectangle (s->display, s->window, s->gc, x, s->y, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1359 s->width - 1, s->height - 1); |
|
26879
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1360 } |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1361 else |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1362 { |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
1363 for (i = 0; i < s->nchars; i++, ++s->gidx) |
|
48383
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1364 { |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1365 XDrawString16 (s->display, s->window, s->gc, |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1366 x + s->cmp->offsets[s->gidx * 2], |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1367 s->ybase - s->cmp->offsets[s->gidx * 2 + 1], |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1368 s->char2b + i, 1); |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1369 if (s->face->overstrike) |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1370 XDrawString16 (s->display, s->window, s->gc, |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1371 x + s->cmp->offsets[s->gidx * 2] + 1, |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1372 s->ybase - s->cmp->offsets[s->gidx * 2 + 1], |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1373 s->char2b + i, 1); |
|
c44793510100
(x_draw_glyph_string_foreground)
Miles Bader <miles@gnu.org>
parents:
48330
diff
changeset
|
1374 } |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1375 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1376 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1377 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1378 |
|
25529
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1379 #ifdef USE_X_TOOLKIT |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1380 |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1381 static struct frame *x_frame_of_widget P_ ((Widget)); |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1382 static Boolean cvt_string_to_pixel P_ ((Display *, XrmValue *, Cardinal *, |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1383 XrmValue *, XrmValue *, XtPointer *)); |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1384 static void cvt_pixel_dtor P_ ((XtAppContext, XrmValue *, XtPointer, |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1385 XrmValue *, Cardinal *)); |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1386 |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1387 |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1388 /* Return the frame on which widget WIDGET is used.. Abort if frame |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1389 cannot be determined. */ |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1390 |
|
29749
4235764941b5
(x_frame_of_widget): Add `static' to declaration (for pcc).
Dave Love <fx@gnu.org>
parents:
29744
diff
changeset
|
1391 static struct frame * |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1392 x_frame_of_widget (widget) |
|
25529
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1393 Widget widget; |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1394 { |
|
25529
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1395 struct x_display_info *dpyinfo; |
|
25716
e2d5cd96727b
(x_scroll_bar_handle_click): Compile only if
Gerd Moellmann <gerd@gnu.org>
parents:
25692
diff
changeset
|
1396 Lisp_Object tail; |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1397 struct frame *f; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1398 |
|
25529
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1399 dpyinfo = x_display_info_for_display (XtDisplay (widget)); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1400 |
|
25529
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1401 /* Find the top-level shell of the widget. Note that this function |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1402 can be called when the widget is not yet realized, so XtWindow |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1403 (widget) == 0. That's the reason we can't simply use |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1404 x_any_window_to_frame. */ |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1405 while (!XtIsTopLevelShell (widget)) |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1406 widget = XtParent (widget); |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1407 |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1408 /* Look for a frame with that top-level widget. Allocate the color |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1409 on that frame to get the right gamma correction value. */ |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1410 for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail)) |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1411 if (GC_FRAMEP (XCAR (tail)) |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1412 && (f = XFRAME (XCAR (tail)), |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1413 (f->output_data.nothing != 1 |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1414 && FRAME_X_DISPLAY_INFO (f) == dpyinfo)) |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1415 && f->output_data.x->widget == widget) |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1416 return f; |
|
25529
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1417 |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1418 abort (); |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1419 } |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1420 |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1421 |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1422 /* Allocate the color COLOR->pixel on the screen and display of |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1423 widget WIDGET in colormap CMAP. If an exact match cannot be |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1424 allocated, try the nearest color available. Value is non-zero |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1425 if successful. This is called from lwlib. */ |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1426 |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1427 int |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1428 x_alloc_nearest_color_for_widget (widget, cmap, color) |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1429 Widget widget; |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1430 Colormap cmap; |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1431 XColor *color; |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1432 { |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1433 struct frame *f = x_frame_of_widget (widget); |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1434 return x_alloc_nearest_color (f, cmap, color); |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1435 } |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1436 |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1437 |
|
31340
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1438 /* Allocate a color which is lighter or darker than *PIXEL by FACTOR |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1439 or DELTA. Try a color with RGB values multiplied by FACTOR first. |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1440 If this produces the same color as PIXEL, try a color where all RGB |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1441 values have DELTA added. Return the allocated color in *PIXEL. |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1442 DISPLAY is the X display, CMAP is the colormap to operate on. |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1443 Value is non-zero if successful. */ |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1444 |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1445 int |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1446 x_alloc_lighter_color_for_widget (widget, display, cmap, pixel, factor, delta) |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1447 Widget widget; |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1448 Display *display; |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1449 Colormap cmap; |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1450 unsigned long *pixel; |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1451 double factor; |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1452 int delta; |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1453 { |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1454 struct frame *f = x_frame_of_widget (widget); |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1455 return x_alloc_lighter_color (f, display, cmap, pixel, factor, delta); |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1456 } |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1457 |
|
6b2ed557e09c
(x_alloc_lighter_color_for_widget): New function.
Miles Bader <miles@gnu.org>
parents:
31011
diff
changeset
|
1458 |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1459 /* Structure specifying which arguments should be passed by Xt to |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1460 cvt_string_to_pixel. We want the widget's screen and colormap. */ |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1461 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1462 static XtConvertArgRec cvt_string_to_pixel_args[] = |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1463 { |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1464 {XtWidgetBaseOffset, (XtPointer) XtOffset (Widget, core.screen), |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1465 sizeof (Screen *)}, |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1466 {XtWidgetBaseOffset, (XtPointer) XtOffset (Widget, core.colormap), |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1467 sizeof (Colormap)} |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1468 }; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1469 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1470 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1471 /* The address of this variable is returned by |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1472 cvt_string_to_pixel. */ |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1473 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1474 static Pixel cvt_string_to_pixel_value; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1475 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1476 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1477 /* Convert a color name to a pixel color. |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1478 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1479 DPY is the display we are working on. |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1480 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1481 ARGS is an array of *NARGS XrmValue structures holding additional |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1482 information about the widget for which the conversion takes place. |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1483 The contents of this array are determined by the specification |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1484 in cvt_string_to_pixel_args. |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1485 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1486 FROM is a pointer to an XrmValue which points to the color name to |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1487 convert. TO is an XrmValue in which to return the pixel color. |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1488 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1489 CLOSURE_RET is a pointer to user-data, in which we record if |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1490 we allocated the color or not. |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1491 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1492 Value is True if successful, False otherwise. */ |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1493 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1494 static Boolean |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1495 cvt_string_to_pixel (dpy, args, nargs, from, to, closure_ret) |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1496 Display *dpy; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1497 XrmValue *args; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1498 Cardinal *nargs; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1499 XrmValue *from, *to; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1500 XtPointer *closure_ret; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1501 { |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1502 Screen *screen; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1503 Colormap cmap; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1504 Pixel pixel; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1505 String color_name; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1506 XColor color; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1507 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1508 if (*nargs != 2) |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1509 { |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1510 XtAppWarningMsg (XtDisplayToApplicationContext (dpy), |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1511 "wrongParameters", "cvt_string_to_pixel", |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1512 "XtToolkitError", |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1513 "Screen and colormap args required", NULL, NULL); |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1514 return False; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1515 } |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1516 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1517 screen = *(Screen **) args[0].addr; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1518 cmap = *(Colormap *) args[1].addr; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1519 color_name = (String) from->addr; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1520 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1521 if (strcmp (color_name, XtDefaultBackground) == 0) |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1522 { |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1523 *closure_ret = (XtPointer) False; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1524 pixel = WhitePixelOfScreen (screen); |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1525 } |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1526 else if (strcmp (color_name, XtDefaultForeground) == 0) |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1527 { |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1528 *closure_ret = (XtPointer) False; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1529 pixel = BlackPixelOfScreen (screen); |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1530 } |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1531 else if (XParseColor (dpy, cmap, color_name, &color) |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1532 && x_alloc_nearest_color_1 (dpy, cmap, &color)) |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1533 { |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1534 pixel = color.pixel; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1535 *closure_ret = (XtPointer) True; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1536 } |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1537 else |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1538 { |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1539 String params[1]; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1540 Cardinal nparams = 1; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1541 |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1542 params[0] = color_name; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1543 XtAppWarningMsg (XtDisplayToApplicationContext (dpy), |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1544 "badValue", "cvt_string_to_pixel", |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1545 "XtToolkitError", "Invalid color `%s'", |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1546 params, &nparams); |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1547 return False; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1548 } |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1549 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1550 if (to->addr != NULL) |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1551 { |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1552 if (to->size < sizeof (Pixel)) |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1553 { |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1554 to->size = sizeof (Pixel); |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1555 return False; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1556 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1557 |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1558 *(Pixel *) to->addr = pixel; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1559 } |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1560 else |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1561 { |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1562 cvt_string_to_pixel_value = pixel; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1563 to->addr = (XtPointer) &cvt_string_to_pixel_value; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1564 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1565 |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1566 to->size = sizeof (Pixel); |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1567 return True; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1568 } |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1569 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1570 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1571 /* Free a pixel color which was previously allocated via |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1572 cvt_string_to_pixel. This is registered as the destructor |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1573 for this type of resource via XtSetTypeConverter. |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1574 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1575 APP is the application context in which we work. |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1576 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1577 TO is a pointer to an XrmValue holding the color to free. |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1578 CLOSURE is the value we stored in CLOSURE_RET for this color |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1579 in cvt_string_to_pixel. |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1580 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1581 ARGS and NARGS are like for cvt_string_to_pixel. */ |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1582 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1583 static void |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1584 cvt_pixel_dtor (app, to, closure, args, nargs) |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1585 XtAppContext app; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1586 XrmValuePtr to; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1587 XtPointer closure; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1588 XrmValuePtr args; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1589 Cardinal *nargs; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1590 { |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1591 if (*nargs != 2) |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1592 { |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1593 XtAppWarningMsg (app, "wrongParameters", "cvt_pixel_dtor", |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1594 "XtToolkitError", |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1595 "Screen and colormap arguments required", |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1596 NULL, NULL); |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1597 } |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1598 else if (closure != NULL) |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1599 { |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1600 /* We did allocate the pixel, so free it. */ |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1601 Screen *screen = *(Screen **) args[0].addr; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1602 Colormap cmap = *(Colormap *) args[1].addr; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1603 x_free_dpy_colors (DisplayOfScreen (screen), screen, cmap, |
|
38255
9ec233999747
* xterm.c (cvt_pixel_dtor): Call x_free_dpy_colors with the
Gerd Moellmann <gerd@gnu.org>
parents:
38246
diff
changeset
|
1604 (Pixel *) to->addr, 1); |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1605 } |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1606 } |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1607 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1608 |
|
25529
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1609 #endif /* USE_X_TOOLKIT */ |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1610 |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1611 |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1612 /* Value is an array of XColor structures for the contents of the |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1613 color map of display DPY. Set *NCELLS to the size of the array. |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1614 Note that this probably shouldn't be called for large color maps, |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1615 say a 24-bit TrueColor map. */ |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1616 |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1617 static const XColor * |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1618 x_color_cells (dpy, ncells) |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1619 Display *dpy; |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1620 int *ncells; |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1621 { |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1622 struct x_display_info *dpyinfo = x_display_info_for_display (dpy); |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1623 |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1624 if (dpyinfo->color_cells == NULL) |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1625 { |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1626 Screen *screen = dpyinfo->screen; |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1627 int i; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1628 |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1629 dpyinfo->ncolor_cells |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1630 = XDisplayCells (dpy, XScreenNumberOfScreen (screen)); |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1631 dpyinfo->color_cells |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1632 = (XColor *) xmalloc (dpyinfo->ncolor_cells |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1633 * sizeof *dpyinfo->color_cells); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1634 |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1635 for (i = 0; i < dpyinfo->ncolor_cells; ++i) |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1636 dpyinfo->color_cells[i].pixel = i; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1637 |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1638 XQueryColors (dpy, dpyinfo->cmap, |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1639 dpyinfo->color_cells, dpyinfo->ncolor_cells); |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1640 } |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1641 |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1642 *ncells = dpyinfo->ncolor_cells; |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1643 return dpyinfo->color_cells; |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1644 } |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1645 |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1646 |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1647 /* On frame F, translate pixel colors to RGB values for the NCOLORS |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1648 colors in COLORS. Use cached information, if available. */ |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1649 |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1650 void |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1651 x_query_colors (f, colors, ncolors) |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1652 struct frame *f; |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1653 XColor *colors; |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1654 int ncolors; |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1655 { |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1656 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1657 |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1658 if (dpyinfo->color_cells) |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1659 { |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1660 int i; |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1661 for (i = 0; i < ncolors; ++i) |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1662 { |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1663 unsigned long pixel = colors[i].pixel; |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1664 xassert (pixel < dpyinfo->ncolor_cells); |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1665 xassert (dpyinfo->color_cells[pixel].pixel == pixel); |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1666 colors[i] = dpyinfo->color_cells[pixel]; |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1667 } |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1668 } |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1669 else |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1670 XQueryColors (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f), colors, ncolors); |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1671 } |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1672 |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1673 |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1674 /* On frame F, translate pixel color to RGB values for the color in |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1675 COLOR. Use cached information, if available. */ |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1676 |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1677 void |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1678 x_query_color (f, color) |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1679 struct frame *f; |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1680 XColor *color; |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1681 { |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1682 x_query_colors (f, color, 1); |
|
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1683 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1684 |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1685 |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1686 /* Allocate the color COLOR->pixel on DISPLAY, colormap CMAP. If an |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1687 exact match can't be allocated, try the nearest color available. |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1688 Value is non-zero if successful. Set *COLOR to the color |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1689 allocated. */ |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1690 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1691 static int |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1692 x_alloc_nearest_color_1 (dpy, cmap, color) |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1693 Display *dpy; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1694 Colormap cmap; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1695 XColor *color; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1696 { |
|
25529
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1697 int rc; |
|
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1698 |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1699 rc = XAllocColor (dpy, cmap, color); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1700 if (rc == 0) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1701 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1702 /* If we got to this point, the colormap is full, so we're going |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1703 to try to get the next closest color. The algorithm used is |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1704 a least-squares matching, which is what X uses for closest |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1705 color matching with StaticColor visuals. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1706 int nearest, i; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1707 unsigned long nearest_delta = ~0; |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1708 int ncells; |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1709 const XColor *cells = x_color_cells (dpy, &ncells); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1710 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1711 for (nearest = i = 0; i < ncells; ++i) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1712 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1713 long dred = (color->red >> 8) - (cells[i].red >> 8); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1714 long dgreen = (color->green >> 8) - (cells[i].green >> 8); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1715 long dblue = (color->blue >> 8) - (cells[i].blue >> 8); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1716 unsigned long delta = dred * dred + dgreen * dgreen + dblue * dblue; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1717 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1718 if (delta < nearest_delta) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1719 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1720 nearest = i; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1721 nearest_delta = delta; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1722 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1723 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1724 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1725 color->red = cells[nearest].red; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1726 color->green = cells[nearest].green; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1727 color->blue = cells[nearest].blue; |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1728 rc = XAllocColor (dpy, cmap, color); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1729 } |
|
33062
c236bd0d44c3
(x_alloc_nearest_color): If allocation succeeds, and
Gerd Moellmann <gerd@gnu.org>
parents:
32988
diff
changeset
|
1730 else |
|
c236bd0d44c3
(x_alloc_nearest_color): If allocation succeeds, and
Gerd Moellmann <gerd@gnu.org>
parents:
32988
diff
changeset
|
1731 { |
|
c236bd0d44c3
(x_alloc_nearest_color): If allocation succeeds, and
Gerd Moellmann <gerd@gnu.org>
parents:
32988
diff
changeset
|
1732 /* If allocation succeeded, and the allocated pixel color is not |
|
c236bd0d44c3
(x_alloc_nearest_color): If allocation succeeds, and
Gerd Moellmann <gerd@gnu.org>
parents:
32988
diff
changeset
|
1733 equal to a cached pixel color recorded earlier, there was a |
|
c236bd0d44c3
(x_alloc_nearest_color): If allocation succeeds, and
Gerd Moellmann <gerd@gnu.org>
parents:
32988
diff
changeset
|
1734 change in the colormap, so clear the color cache. */ |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1735 struct x_display_info *dpyinfo = x_display_info_for_display (dpy); |
|
33062
c236bd0d44c3
(x_alloc_nearest_color): If allocation succeeds, and
Gerd Moellmann <gerd@gnu.org>
parents:
32988
diff
changeset
|
1736 XColor *cached_color; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1737 |
|
33062
c236bd0d44c3
(x_alloc_nearest_color): If allocation succeeds, and
Gerd Moellmann <gerd@gnu.org>
parents:
32988
diff
changeset
|
1738 if (dpyinfo->color_cells |
|
c236bd0d44c3
(x_alloc_nearest_color): If allocation succeeds, and
Gerd Moellmann <gerd@gnu.org>
parents:
32988
diff
changeset
|
1739 && (cached_color = &dpyinfo->color_cells[color->pixel], |
|
33064
9de33d895c6c
(x_alloc_nearest_color): Fix last change to compare
Gerd Moellmann <gerd@gnu.org>
parents:
33062
diff
changeset
|
1740 (cached_color->red != color->red |
|
9de33d895c6c
(x_alloc_nearest_color): Fix last change to compare
Gerd Moellmann <gerd@gnu.org>
parents:
33062
diff
changeset
|
1741 || cached_color->blue != color->blue |
|
9de33d895c6c
(x_alloc_nearest_color): Fix last change to compare
Gerd Moellmann <gerd@gnu.org>
parents:
33062
diff
changeset
|
1742 || cached_color->green != color->green))) |
|
33062
c236bd0d44c3
(x_alloc_nearest_color): If allocation succeeds, and
Gerd Moellmann <gerd@gnu.org>
parents:
32988
diff
changeset
|
1743 { |
|
c236bd0d44c3
(x_alloc_nearest_color): If allocation succeeds, and
Gerd Moellmann <gerd@gnu.org>
parents:
32988
diff
changeset
|
1744 xfree (dpyinfo->color_cells); |
|
c236bd0d44c3
(x_alloc_nearest_color): If allocation succeeds, and
Gerd Moellmann <gerd@gnu.org>
parents:
32988
diff
changeset
|
1745 dpyinfo->color_cells = NULL; |
|
c236bd0d44c3
(x_alloc_nearest_color): If allocation succeeds, and
Gerd Moellmann <gerd@gnu.org>
parents:
32988
diff
changeset
|
1746 dpyinfo->ncolor_cells = 0; |
|
c236bd0d44c3
(x_alloc_nearest_color): If allocation succeeds, and
Gerd Moellmann <gerd@gnu.org>
parents:
32988
diff
changeset
|
1747 } |
|
c236bd0d44c3
(x_alloc_nearest_color): If allocation succeeds, and
Gerd Moellmann <gerd@gnu.org>
parents:
32988
diff
changeset
|
1748 } |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1749 |
|
28356
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1750 #ifdef DEBUG_X_COLORS |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1751 if (rc) |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1752 register_color (color->pixel); |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1753 #endif /* DEBUG_X_COLORS */ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1754 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1755 return rc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1756 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1757 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1758 |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1759 /* Allocate the color COLOR->pixel on frame F, colormap CMAP. If an |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1760 exact match can't be allocated, try the nearest color available. |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1761 Value is non-zero if successful. Set *COLOR to the color |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1762 allocated. */ |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1763 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1764 int |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1765 x_alloc_nearest_color (f, cmap, color) |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1766 struct frame *f; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1767 Colormap cmap; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1768 XColor *color; |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1769 { |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1770 gamma_correct (f, color); |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1771 return x_alloc_nearest_color_1 (FRAME_X_DISPLAY (f), cmap, color); |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1772 } |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1773 |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
1774 |
|
28356
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1775 /* Allocate color PIXEL on frame F. PIXEL must already be allocated. |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1776 It's necessary to do this instead of just using PIXEL directly to |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1777 get color reference counts right. */ |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1778 |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1779 unsigned long |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1780 x_copy_color (f, pixel) |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1781 struct frame *f; |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1782 unsigned long pixel; |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1783 { |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1784 XColor color; |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1785 |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1786 color.pixel = pixel; |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1787 BLOCK_INPUT; |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1788 x_query_color (f, &color); |
|
28356
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1789 XAllocColor (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f), &color); |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1790 UNBLOCK_INPUT; |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1791 #ifdef DEBUG_X_COLORS |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1792 register_color (pixel); |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1793 #endif |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1794 return color.pixel; |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1795 } |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1796 |
|
c94ec7e56746
(x_copy_color): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28321
diff
changeset
|
1797 |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1798 /* Allocate color PIXEL on display DPY. PIXEL must already be allocated. |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1799 It's necessary to do this instead of just using PIXEL directly to |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1800 get color reference counts right. */ |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1801 |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1802 unsigned long |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1803 x_copy_dpy_color (dpy, cmap, pixel) |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1804 Display *dpy; |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1805 Colormap cmap; |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1806 unsigned long pixel; |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1807 { |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1808 XColor color; |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1809 |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1810 color.pixel = pixel; |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1811 BLOCK_INPUT; |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1812 XQueryColor (dpy, cmap, &color); |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1813 XAllocColor (dpy, cmap, &color); |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1814 UNBLOCK_INPUT; |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1815 #ifdef DEBUG_X_COLORS |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1816 register_color (pixel); |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1817 #endif |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1818 return color.pixel; |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1819 } |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1820 |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
1821 |
|
33456
d8d4ecfa24fd
(x_alloc_lighter_color): Use real brightness calculation.
Miles Bader <miles@gnu.org>
parents:
33449
diff
changeset
|
1822 /* Brightness beyond which a color won't have its highlight brightness |
|
d8d4ecfa24fd
(x_alloc_lighter_color): Use real brightness calculation.
Miles Bader <miles@gnu.org>
parents:
33449
diff
changeset
|
1823 boosted. |
|
d8d4ecfa24fd
(x_alloc_lighter_color): Use real brightness calculation.
Miles Bader <miles@gnu.org>
parents:
33449
diff
changeset
|
1824 |
|
33449
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1825 Nominally, highlight colors for `3d' faces are calculated by |
|
33456
d8d4ecfa24fd
(x_alloc_lighter_color): Use real brightness calculation.
Miles Bader <miles@gnu.org>
parents:
33449
diff
changeset
|
1826 brightening an object's color by a constant scale factor, but this |
|
d8d4ecfa24fd
(x_alloc_lighter_color): Use real brightness calculation.
Miles Bader <miles@gnu.org>
parents:
33449
diff
changeset
|
1827 doesn't yield good results for dark colors, so for colors who's |
|
d8d4ecfa24fd
(x_alloc_lighter_color): Use real brightness calculation.
Miles Bader <miles@gnu.org>
parents:
33449
diff
changeset
|
1828 brightness is less than this value (on a scale of 0-65535) have an |
|
d8d4ecfa24fd
(x_alloc_lighter_color): Use real brightness calculation.
Miles Bader <miles@gnu.org>
parents:
33449
diff
changeset
|
1829 use an additional additive factor. |
|
33449
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1830 |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1831 The value here is set so that the default menu-bar/mode-line color |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1832 (grey75) will not have its highlights changed at all. */ |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1833 #define HIGHLIGHT_COLOR_DARK_BOOST_LIMIT 48000 |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1834 |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1835 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1836 /* Allocate a color which is lighter or darker than *PIXEL by FACTOR |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1837 or DELTA. Try a color with RGB values multiplied by FACTOR first. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1838 If this produces the same color as PIXEL, try a color where all RGB |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1839 values have DELTA added. Return the allocated color in *PIXEL. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1840 DISPLAY is the X display, CMAP is the colormap to operate on. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1841 Value is non-zero if successful. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1842 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1843 static int |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1844 x_alloc_lighter_color (f, display, cmap, pixel, factor, delta) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1845 struct frame *f; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1846 Display *display; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1847 Colormap cmap; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1848 unsigned long *pixel; |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25921
diff
changeset
|
1849 double factor; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1850 int delta; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1851 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1852 XColor color, new; |
|
33449
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1853 long bright; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1854 int success_p; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1855 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1856 /* Get RGB color values. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1857 color.pixel = *pixel; |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
1858 x_query_color (f, &color); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1859 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1860 /* Change RGB values by specified FACTOR. Avoid overflow! */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1861 xassert (factor >= 0); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1862 new.red = min (0xffff, factor * color.red); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1863 new.green = min (0xffff, factor * color.green); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1864 new.blue = min (0xffff, factor * color.blue); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1865 |
|
33456
d8d4ecfa24fd
(x_alloc_lighter_color): Use real brightness calculation.
Miles Bader <miles@gnu.org>
parents:
33449
diff
changeset
|
1866 /* Calculate brightness of COLOR. */ |
|
d8d4ecfa24fd
(x_alloc_lighter_color): Use real brightness calculation.
Miles Bader <miles@gnu.org>
parents:
33449
diff
changeset
|
1867 bright = (2 * color.red + 3 * color.green + color.blue) / 6; |
|
33449
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1868 |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1869 /* We only boost colors that are darker than |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1870 HIGHLIGHT_COLOR_DARK_BOOST_LIMIT. */ |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1871 if (bright < HIGHLIGHT_COLOR_DARK_BOOST_LIMIT) |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1872 /* Make an additive adjustment to NEW, because it's dark enough so |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1873 that scaling by FACTOR alone isn't enough. */ |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1874 { |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1875 /* How far below the limit this color is (0 - 1, 1 being darker). */ |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1876 double dimness = 1 - (double)bright / HIGHLIGHT_COLOR_DARK_BOOST_LIMIT; |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1877 /* The additive adjustment. */ |
|
33456
d8d4ecfa24fd
(x_alloc_lighter_color): Use real brightness calculation.
Miles Bader <miles@gnu.org>
parents:
33449
diff
changeset
|
1878 int min_delta = delta * dimness * factor / 2; |
|
33449
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1879 |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1880 if (factor < 1) |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1881 { |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1882 new.red = max (0, new.red - min_delta); |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1883 new.green = max (0, new.green - min_delta); |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1884 new.blue = max (0, new.blue - min_delta); |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1885 } |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1886 else |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1887 { |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1888 new.red = min (0xffff, min_delta + new.red); |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1889 new.green = min (0xffff, min_delta + new.green); |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1890 new.blue = min (0xffff, min_delta + new.blue); |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1891 } |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1892 } |
|
41fcaa0b864b
(x_alloc_lighter_color): Include an additive component too for dark
Miles Bader <miles@gnu.org>
parents:
33303
diff
changeset
|
1893 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1894 /* Try to allocate the color. */ |
|
25529
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1895 success_p = x_alloc_nearest_color (f, cmap, &new); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1896 if (success_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1897 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1898 if (new.pixel == *pixel) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1899 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1900 /* If we end up with the same color as before, try adding |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1901 delta to the RGB values. */ |
|
27962
048184bb751e
(x_alloc_lighter_color, x_setup_relief_color): Use
Gerd Moellmann <gerd@gnu.org>
parents:
27857
diff
changeset
|
1902 x_free_colors (f, &new.pixel, 1); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1903 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1904 new.red = min (0xffff, delta + color.red); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1905 new.green = min (0xffff, delta + color.green); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1906 new.blue = min (0xffff, delta + color.blue); |
|
25529
7ae6423812ae
(XTset_vertical_scroll_bar): Block input when clearing
Gerd Moellmann <gerd@gnu.org>
parents:
25512
diff
changeset
|
1907 success_p = x_alloc_nearest_color (f, cmap, &new); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1908 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1909 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1910 success_p = 1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1911 *pixel = new.pixel; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1912 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1913 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1914 return success_p; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1915 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1916 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1917 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1918 /* Set up the foreground color for drawing relief lines of glyph |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1919 string S. RELIEF is a pointer to a struct relief containing the GC |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1920 with which lines will be drawn. Use a color that is FACTOR or |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1921 DELTA lighter or darker than the relief's background which is found |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1922 in S->f->output_data.x->relief_background. If such a color cannot |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1923 be allocated, use DEFAULT_PIXEL, instead. */ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1924 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1925 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1926 x_setup_relief_color (f, relief, factor, delta, default_pixel) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1927 struct frame *f; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1928 struct relief *relief; |
|
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25921
diff
changeset
|
1929 double factor; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1930 int delta; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1931 unsigned long default_pixel; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1932 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1933 XGCValues xgcv; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1934 struct x_output *di = f->output_data.x; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1935 unsigned long mask = GCForeground | GCLineWidth | GCGraphicsExposures; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1936 unsigned long pixel; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1937 unsigned long background = di->relief_background; |
|
27985
4ba445af210b
(x_term_init): Set Colormap member of x_display_info
Gerd Moellmann <gerd@gnu.org>
parents:
27974
diff
changeset
|
1938 Colormap cmap = FRAME_X_COLORMAP (f); |
|
25091
c3dc74005d22
(x_set_toolkit_scroll_bar_thumb): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
25085
diff
changeset
|
1939 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
c3dc74005d22
(x_set_toolkit_scroll_bar_thumb): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
25085
diff
changeset
|
1940 Display *dpy = FRAME_X_DISPLAY (f); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1941 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1942 xgcv.graphics_exposures = False; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1943 xgcv.line_width = 1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1944 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1945 /* Free previously allocated color. The color cell will be reused |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1946 when it has been freed as many times as it was allocated, so this |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1947 doesn't affect faces using the same colors. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1948 if (relief->gc |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1949 && relief->allocated_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1950 { |
|
27962
048184bb751e
(x_alloc_lighter_color, x_setup_relief_color): Use
Gerd Moellmann <gerd@gnu.org>
parents:
27857
diff
changeset
|
1951 x_free_colors (f, &relief->pixel, 1); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1952 relief->allocated_p = 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1953 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1954 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1955 /* Allocate new color. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1956 xgcv.foreground = default_pixel; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1957 pixel = background; |
|
25091
c3dc74005d22
(x_set_toolkit_scroll_bar_thumb): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
25085
diff
changeset
|
1958 if (dpyinfo->n_planes != 1 |
|
c3dc74005d22
(x_set_toolkit_scroll_bar_thumb): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
25085
diff
changeset
|
1959 && x_alloc_lighter_color (f, dpy, cmap, &pixel, factor, delta)) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1960 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1961 relief->allocated_p = 1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1962 xgcv.foreground = relief->pixel = pixel; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1963 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1964 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1965 if (relief->gc == 0) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1966 { |
|
25091
c3dc74005d22
(x_set_toolkit_scroll_bar_thumb): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
25085
diff
changeset
|
1967 xgcv.stipple = dpyinfo->gray; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1968 mask |= GCStipple; |
|
25091
c3dc74005d22
(x_set_toolkit_scroll_bar_thumb): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
25085
diff
changeset
|
1969 relief->gc = XCreateGC (dpy, FRAME_X_WINDOW (f), mask, &xgcv); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1970 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1971 else |
|
25091
c3dc74005d22
(x_set_toolkit_scroll_bar_thumb): Don't call
Gerd Moellmann <gerd@gnu.org>
parents:
25085
diff
changeset
|
1972 XChangeGC (dpy, relief->gc, mask, &xgcv); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1973 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1974 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1975 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1976 /* Set up colors for the relief lines around glyph string S. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1977 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1978 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1979 x_setup_relief_colors (s) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1980 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1981 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1982 struct x_output *di = s->f->output_data.x; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1983 unsigned long color; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1984 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1985 if (s->face->use_box_color_for_shadows_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1986 color = s->face->box_color; |
|
40265
44df655be97a
(x_setup_relief_colors): Use `IMAGE_BACKGROUND' and
Miles Bader <miles@gnu.org>
parents:
40259
diff
changeset
|
1987 else if (s->first_glyph->type == IMAGE_GLYPH |
|
42376
0f408d016a15
(x_setup_relief_colors): Don't compute an image's
Gerd Moellmann <gerd@gnu.org>
parents:
42374
diff
changeset
|
1988 && s->img->pixmap |
|
40265
44df655be97a
(x_setup_relief_colors): Use `IMAGE_BACKGROUND' and
Miles Bader <miles@gnu.org>
parents:
40259
diff
changeset
|
1989 && !IMAGE_BACKGROUND_TRANSPARENT (s->img, s->f, 0)) |
|
44df655be97a
(x_setup_relief_colors): Use `IMAGE_BACKGROUND' and
Miles Bader <miles@gnu.org>
parents:
40259
diff
changeset
|
1990 color = IMAGE_BACKGROUND (s->img, s->f, 0); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1991 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1992 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1993 XGCValues xgcv; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
1994 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1995 /* Get the background color of the face. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1996 XGetGCValues (s->display, s->gc, GCBackground, &xgcv); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1997 color = xgcv.background; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1998 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
1999 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2000 if (di->white_relief.gc == 0 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2001 || color != di->relief_background) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2002 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2003 di->relief_background = color; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2004 x_setup_relief_color (s->f, &di->white_relief, 1.2, 0x8000, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2005 WHITE_PIX_DEFAULT (s->f)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2006 x_setup_relief_color (s->f, &di->black_relief, 0.6, 0x4000, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2007 BLACK_PIX_DEFAULT (s->f)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2008 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2009 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2010 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2011 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2012 /* Draw a relief on frame F inside the rectangle given by LEFT_X, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2013 TOP_Y, RIGHT_X, and BOTTOM_Y. WIDTH is the thickness of the relief |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2014 to draw, it must be >= 0. RAISED_P non-zero means draw a raised |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2015 relief. LEFT_P non-zero means draw a relief on the left side of |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2016 the rectangle. RIGHT_P non-zero means draw a relief on the right |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2017 side of the rectangle. CLIP_RECT is the clipping rectangle to use |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2018 when drawing. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2019 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2020 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2021 x_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2022 raised_p, left_p, right_p, clip_rect) |
| 771 | 2023 struct frame *f; |
|
48330
e5d539ae9468
(x_draw_relief_rect, x_draw_box_rect, x_update_cursor):
Dave Love <fx@gnu.org>
parents:
48169
diff
changeset
|
2024 int left_x, top_y, right_x, bottom_y, width, left_p, right_p, raised_p; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2025 XRectangle *clip_rect; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2026 { |
|
39474
5f9f7d59fd79
(x_draw_relief_rect): Draw bottom relief 1 pixel more
Gerd Moellmann <gerd@gnu.org>
parents:
39434
diff
changeset
|
2027 Display *dpy = FRAME_X_DISPLAY (f); |
|
5f9f7d59fd79
(x_draw_relief_rect): Draw bottom relief 1 pixel more
Gerd Moellmann <gerd@gnu.org>
parents:
39434
diff
changeset
|
2028 Window window = FRAME_X_WINDOW (f); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2029 int i; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2030 GC gc; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2031 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2032 if (raised_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2033 gc = f->output_data.x->white_relief.gc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2034 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2035 gc = f->output_data.x->black_relief.gc; |
|
39474
5f9f7d59fd79
(x_draw_relief_rect): Draw bottom relief 1 pixel more
Gerd Moellmann <gerd@gnu.org>
parents:
39434
diff
changeset
|
2036 XSetClipRectangles (dpy, gc, 0, 0, clip_rect, 1, Unsorted); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2037 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2038 /* Top. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2039 for (i = 0; i < width; ++i) |
|
39474
5f9f7d59fd79
(x_draw_relief_rect): Draw bottom relief 1 pixel more
Gerd Moellmann <gerd@gnu.org>
parents:
39434
diff
changeset
|
2040 XDrawLine (dpy, window, gc, |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2041 left_x + i * left_p, top_y + i, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2042 right_x + 1 - i * right_p, top_y + i); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2043 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2044 /* Left. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2045 if (left_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2046 for (i = 0; i < width; ++i) |
|
39474
5f9f7d59fd79
(x_draw_relief_rect): Draw bottom relief 1 pixel more
Gerd Moellmann <gerd@gnu.org>
parents:
39434
diff
changeset
|
2047 XDrawLine (dpy, window, gc, |
|
37033
fe7885cc9458
(x_draw_relief_rect): Extend left shadow to the
Gerd Moellmann <gerd@gnu.org>
parents:
37031
diff
changeset
|
2048 left_x + i, top_y + i, left_x + i, bottom_y - i + 1); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2049 |
|
39474
5f9f7d59fd79
(x_draw_relief_rect): Draw bottom relief 1 pixel more
Gerd Moellmann <gerd@gnu.org>
parents:
39434
diff
changeset
|
2050 XSetClipMask (dpy, gc, None); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2051 if (raised_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2052 gc = f->output_data.x->black_relief.gc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2053 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2054 gc = f->output_data.x->white_relief.gc; |
|
39474
5f9f7d59fd79
(x_draw_relief_rect): Draw bottom relief 1 pixel more
Gerd Moellmann <gerd@gnu.org>
parents:
39434
diff
changeset
|
2055 XSetClipRectangles (dpy, gc, 0, 0, clip_rect, 1, Unsorted); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2056 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2057 /* Bottom. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2058 for (i = 0; i < width; ++i) |
|
39474
5f9f7d59fd79
(x_draw_relief_rect): Draw bottom relief 1 pixel more
Gerd Moellmann <gerd@gnu.org>
parents:
39434
diff
changeset
|
2059 XDrawLine (dpy, window, gc, |
|
5f9f7d59fd79
(x_draw_relief_rect): Draw bottom relief 1 pixel more
Gerd Moellmann <gerd@gnu.org>
parents:
39434
diff
changeset
|
2060 left_x + i * left_p, bottom_y - i, |
|
40499
55065421f9e7
(x_draw_relief_rect): Correct bottom relief by 1 pixel.
Gerd Moellmann <gerd@gnu.org>
parents:
40446
diff
changeset
|
2061 right_x + 1 - i * right_p, bottom_y - i); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2062 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2063 /* Right. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2064 if (right_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2065 for (i = 0; i < width; ++i) |
|
39474
5f9f7d59fd79
(x_draw_relief_rect): Draw bottom relief 1 pixel more
Gerd Moellmann <gerd@gnu.org>
parents:
39434
diff
changeset
|
2066 XDrawLine (dpy, window, gc, |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2067 right_x - i, top_y + i + 1, right_x - i, bottom_y - i); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2068 |
|
39474
5f9f7d59fd79
(x_draw_relief_rect): Draw bottom relief 1 pixel more
Gerd Moellmann <gerd@gnu.org>
parents:
39434
diff
changeset
|
2069 XSetClipMask (dpy, gc, None); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2070 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2071 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2072 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2073 /* Draw a box on frame F inside the rectangle given by LEFT_X, TOP_Y, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2074 RIGHT_X, and BOTTOM_Y. WIDTH is the thickness of the lines to |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2075 draw, it must be >= 0. LEFT_P non-zero means draw a line on the |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2076 left side of the rectangle. RIGHT_P non-zero means draw a line |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2077 on the right side of the rectangle. CLIP_RECT is the clipping |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2078 rectangle to use when drawing. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2079 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2080 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2081 x_draw_box_rect (s, left_x, top_y, right_x, bottom_y, width, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2082 left_p, right_p, clip_rect) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2083 struct glyph_string *s; |
|
48330
e5d539ae9468
(x_draw_relief_rect, x_draw_box_rect, x_update_cursor):
Dave Love <fx@gnu.org>
parents:
48169
diff
changeset
|
2084 int left_x, top_y, right_x, bottom_y, width, left_p, right_p; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2085 XRectangle *clip_rect; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2086 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2087 XGCValues xgcv; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2088 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2089 XGetGCValues (s->display, s->gc, GCForeground, &xgcv); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2090 XSetForeground (s->display, s->gc, s->face->box_color); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2091 XSetClipRectangles (s->display, s->gc, 0, 0, clip_rect, 1, Unsorted); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2092 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2093 /* Top. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2094 XFillRectangle (s->display, s->window, s->gc, |
|
32513
545db232e60c
(x_draw_box_rect): Fix the calculation of width and height for
Kenichi Handa <handa@m17n.org>
parents:
32401
diff
changeset
|
2095 left_x, top_y, right_x - left_x + 1, width); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2096 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2097 /* Left. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2098 if (left_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2099 XFillRectangle (s->display, s->window, s->gc, |
|
32513
545db232e60c
(x_draw_box_rect): Fix the calculation of width and height for
Kenichi Handa <handa@m17n.org>
parents:
32401
diff
changeset
|
2100 left_x, top_y, width, bottom_y - top_y + 1); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2101 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2102 /* Bottom. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2103 XFillRectangle (s->display, s->window, s->gc, |
|
32513
545db232e60c
(x_draw_box_rect): Fix the calculation of width and height for
Kenichi Handa <handa@m17n.org>
parents:
32401
diff
changeset
|
2104 left_x, bottom_y - width + 1, right_x - left_x + 1, width); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2105 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2106 /* Right. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2107 if (right_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2108 XFillRectangle (s->display, s->window, s->gc, |
|
32513
545db232e60c
(x_draw_box_rect): Fix the calculation of width and height for
Kenichi Handa <handa@m17n.org>
parents:
32401
diff
changeset
|
2109 right_x - width + 1, top_y, width, bottom_y - top_y + 1); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2110 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2111 XSetForeground (s->display, s->gc, xgcv.foreground); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2112 XSetClipMask (s->display, s->gc, None); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2113 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2114 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2115 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2116 /* Draw a box around glyph string S. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2117 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2118 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2119 x_draw_glyph_string_box (s) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2120 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2121 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2122 int width, left_x, right_x, top_y, bottom_y, last_x, raised_p; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2123 int left_p, right_p; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2124 struct glyph *last_glyph; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2125 XRectangle clip_rect; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2126 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2127 last_x = window_box_right (s->w, s->area); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2128 if (s->row->full_width_p |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2129 && !s->w->pseudo_window_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2130 { |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
2131 last_x += WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH (s->w); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
2132 if (s->area != RIGHT_MARGIN_AREA |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
2133 || WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (s->w)) |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
2134 last_x += WINDOW_RIGHT_FRINGE_WIDTH (s->w); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2135 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2136 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2137 /* The glyph that may have a right box line. */ |
|
26879
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
2138 last_glyph = (s->cmp || s->img |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2139 ? s->first_glyph |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2140 : s->first_glyph + s->nchars - 1); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2141 |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
2142 width = abs (s->face->box_line_width); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2143 raised_p = s->face->box == FACE_RAISED_BOX; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2144 left_x = s->x; |
|
36795
e7722a221c28
(x_draw_glyph_string_box): Don't draw a full-width
Gerd Moellmann <gerd@gnu.org>
parents:
36776
diff
changeset
|
2145 right_x = (s->row->full_width_p && s->extends_to_end_of_line_p |
|
e7722a221c28
(x_draw_glyph_string_box): Don't draw a full-width
Gerd Moellmann <gerd@gnu.org>
parents:
36776
diff
changeset
|
2146 ? last_x - 1 |
|
e7722a221c28
(x_draw_glyph_string_box): Don't draw a full-width
Gerd Moellmann <gerd@gnu.org>
parents:
36776
diff
changeset
|
2147 : min (last_x, s->x + s->background_width) - 1); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2148 top_y = s->y; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2149 bottom_y = top_y + s->height - 1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2150 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2151 left_p = (s->first_glyph->left_box_line_p |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2152 || (s->hl == DRAW_MOUSE_FACE |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2153 && (s->prev == NULL |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2154 || s->prev->hl != s->hl))); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2155 right_p = (last_glyph->right_box_line_p |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2156 || (s->hl == DRAW_MOUSE_FACE |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2157 && (s->next == NULL |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2158 || s->next->hl != s->hl))); |
|
40499
55065421f9e7
(x_draw_relief_rect): Correct bottom relief by 1 pixel.
Gerd Moellmann <gerd@gnu.org>
parents:
40446
diff
changeset
|
2159 |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2160 get_glyph_string_clip_rect (s, &clip_rect); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2161 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2162 if (s->face->box == FACE_SIMPLE_BOX) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2163 x_draw_box_rect (s, left_x, top_y, right_x, bottom_y, width, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2164 left_p, right_p, &clip_rect); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2165 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2166 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2167 x_setup_relief_colors (s); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2168 x_draw_relief_rect (s->f, left_x, top_y, right_x, bottom_y, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2169 width, raised_p, left_p, right_p, &clip_rect); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2170 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2171 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2172 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2173 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2174 /* Draw foreground of image glyph string S. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2175 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2176 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2177 x_draw_image_foreground (s) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2178 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2179 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2180 int x; |
|
28785
796eafcfc070
(x_produce_image_glyph, x_draw_image_foreground)
Gerd Moellmann <gerd@gnu.org>
parents:
28686
diff
changeset
|
2181 int y = s->ybase - image_ascent (s->img, s->face); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2182 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2183 /* If first glyph of S has a left box line, start drawing it to the |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2184 right of that line. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2185 if (s->face->box != FACE_NO_BOX |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2186 && s->first_glyph->left_box_line_p) |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
2187 x = s->x + abs (s->face->box_line_width); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2188 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2189 x = s->x; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2190 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2191 /* If there is a margin around the image, adjust x- and y-position |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2192 by that margin. */ |
|
35276
008aea836cbc
(x_produce_image_glyph, x_draw_image_foreground)
Gerd Moellmann <gerd@gnu.org>
parents:
35272
diff
changeset
|
2193 x += s->img->hmargin; |
|
008aea836cbc
(x_produce_image_glyph, x_draw_image_foreground)
Gerd Moellmann <gerd@gnu.org>
parents:
35272
diff
changeset
|
2194 y += s->img->vmargin; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2195 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2196 if (s->img->pixmap) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2197 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2198 if (s->img->mask) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2199 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2200 /* We can't set both a clip mask and use XSetClipRectangles |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2201 because the latter also sets a clip mask. We also can't |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2202 trust on the shape extension to be available |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2203 (XShapeCombineRegion). So, compute the rectangle to draw |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2204 manually. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2205 unsigned long mask = (GCClipMask | GCClipXOrigin | GCClipYOrigin |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2206 | GCFunction); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2207 XGCValues xgcv; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2208 XRectangle clip_rect, image_rect, r; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2209 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2210 xgcv.clip_mask = s->img->mask; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2211 xgcv.clip_x_origin = x; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2212 xgcv.clip_y_origin = y; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2213 xgcv.function = GXcopy; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2214 XChangeGC (s->display, s->gc, mask, &xgcv); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2215 |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2216 get_glyph_string_clip_rect (s, &clip_rect); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2217 image_rect.x = x; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2218 image_rect.y = y; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2219 image_rect.width = s->img->width; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2220 image_rect.height = s->img->height; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2221 if (x_intersect_rectangles (&clip_rect, &image_rect, &r)) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2222 XCopyArea (s->display, s->img->pixmap, s->window, s->gc, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2223 r.x - x, r.y - y, r.width, r.height, r.x, r.y); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2224 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2225 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2226 { |
|
30653
319c3bad8ada
(x_draw_image_foreground): Avoid drawing outside
Gerd Moellmann <gerd@gnu.org>
parents:
30371
diff
changeset
|
2227 XRectangle clip_rect, image_rect, r; |
|
319c3bad8ada
(x_draw_image_foreground): Avoid drawing outside
Gerd Moellmann <gerd@gnu.org>
parents:
30371
diff
changeset
|
2228 |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2229 get_glyph_string_clip_rect (s, &clip_rect); |
|
30653
319c3bad8ada
(x_draw_image_foreground): Avoid drawing outside
Gerd Moellmann <gerd@gnu.org>
parents:
30371
diff
changeset
|
2230 image_rect.x = x; |
|
319c3bad8ada
(x_draw_image_foreground): Avoid drawing outside
Gerd Moellmann <gerd@gnu.org>
parents:
30371
diff
changeset
|
2231 image_rect.y = y; |
|
319c3bad8ada
(x_draw_image_foreground): Avoid drawing outside
Gerd Moellmann <gerd@gnu.org>
parents:
30371
diff
changeset
|
2232 image_rect.width = s->img->width; |
|
319c3bad8ada
(x_draw_image_foreground): Avoid drawing outside
Gerd Moellmann <gerd@gnu.org>
parents:
30371
diff
changeset
|
2233 image_rect.height = s->img->height; |
|
319c3bad8ada
(x_draw_image_foreground): Avoid drawing outside
Gerd Moellmann <gerd@gnu.org>
parents:
30371
diff
changeset
|
2234 if (x_intersect_rectangles (&clip_rect, &image_rect, &r)) |
|
319c3bad8ada
(x_draw_image_foreground): Avoid drawing outside
Gerd Moellmann <gerd@gnu.org>
parents:
30371
diff
changeset
|
2235 XCopyArea (s->display, s->img->pixmap, s->window, s->gc, |
|
319c3bad8ada
(x_draw_image_foreground): Avoid drawing outside
Gerd Moellmann <gerd@gnu.org>
parents:
30371
diff
changeset
|
2236 r.x - x, r.y - y, r.width, r.height, r.x, r.y); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2237 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2238 /* When the image has a mask, we can expect that at |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2239 least part of a mouse highlight or a block cursor will |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2240 be visible. If the image doesn't have a mask, make |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2241 a block cursor visible by drawing a rectangle around |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2242 the image. I believe it's looking better if we do |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2243 nothing here for mouse-face. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2244 if (s->hl == DRAW_CURSOR) |
|
45197
0b6da8b7d7ac
(x_draw_image_foreground, x_draw_image_foreground_1):
Kim F. Storm <storm@cua.dk>
parents:
44974
diff
changeset
|
2245 { |
|
0b6da8b7d7ac
(x_draw_image_foreground, x_draw_image_foreground_1):
Kim F. Storm <storm@cua.dk>
parents:
44974
diff
changeset
|
2246 int r = s->img->relief; |
|
0b6da8b7d7ac
(x_draw_image_foreground, x_draw_image_foreground_1):
Kim F. Storm <storm@cua.dk>
parents:
44974
diff
changeset
|
2247 if (r < 0) r = -r; |
|
0b6da8b7d7ac
(x_draw_image_foreground, x_draw_image_foreground_1):
Kim F. Storm <storm@cua.dk>
parents:
44974
diff
changeset
|
2248 XDrawRectangle (s->display, s->window, s->gc, x - r, y - r, |
|
0b6da8b7d7ac
(x_draw_image_foreground, x_draw_image_foreground_1):
Kim F. Storm <storm@cua.dk>
parents:
44974
diff
changeset
|
2249 s->img->width + r*2 - 1, s->img->height + r*2 - 1); |
|
0b6da8b7d7ac
(x_draw_image_foreground, x_draw_image_foreground_1):
Kim F. Storm <storm@cua.dk>
parents:
44974
diff
changeset
|
2250 } |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2251 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2252 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2253 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2254 /* Draw a rectangle if image could not be loaded. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2255 XDrawRectangle (s->display, s->window, s->gc, x, y, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2256 s->img->width - 1, s->img->height - 1); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2257 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2258 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2259 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2260 /* Draw a relief around the image glyph string S. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2261 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2262 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2263 x_draw_image_relief (s) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2264 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2265 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2266 int x0, y0, x1, y1, thick, raised_p; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2267 XRectangle r; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2268 int x; |
|
28785
796eafcfc070
(x_produce_image_glyph, x_draw_image_foreground)
Gerd Moellmann <gerd@gnu.org>
parents:
28686
diff
changeset
|
2269 int y = s->ybase - image_ascent (s->img, s->face); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2270 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2271 /* If first glyph of S has a left box line, start drawing it to the |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2272 right of that line. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2273 if (s->face->box != FACE_NO_BOX |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2274 && s->first_glyph->left_box_line_p) |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
2275 x = s->x + abs (s->face->box_line_width); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2276 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2277 x = s->x; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2278 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2279 /* If there is a margin around the image, adjust x- and y-position |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2280 by that margin. */ |
|
35276
008aea836cbc
(x_produce_image_glyph, x_draw_image_foreground)
Gerd Moellmann <gerd@gnu.org>
parents:
35272
diff
changeset
|
2281 x += s->img->hmargin; |
|
008aea836cbc
(x_produce_image_glyph, x_draw_image_foreground)
Gerd Moellmann <gerd@gnu.org>
parents:
35272
diff
changeset
|
2282 y += s->img->vmargin; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2283 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2284 if (s->hl == DRAW_IMAGE_SUNKEN |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2285 || s->hl == DRAW_IMAGE_RAISED) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2286 { |
|
41791
fcab0e888c5c
(x_draw_image_relief): Use predefined macro instead of constant when the
Pavel Jan?k <Pavel@Janik.cz>
parents:
41788
diff
changeset
|
2287 thick = tool_bar_button_relief >= 0 ? tool_bar_button_relief : DEFAULT_TOOL_BAR_BUTTON_RELIEF; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2288 raised_p = s->hl == DRAW_IMAGE_RAISED; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2289 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2290 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2291 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2292 thick = abs (s->img->relief); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2293 raised_p = s->img->relief > 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2294 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2295 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2296 x0 = x - thick; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2297 y0 = y - thick; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2298 x1 = x + s->img->width + thick - 1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2299 y1 = y + s->img->height + thick - 1; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2300 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2301 x_setup_relief_colors (s); |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2302 get_glyph_string_clip_rect (s, &r); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2303 x_draw_relief_rect (s->f, x0, y0, x1, y1, thick, raised_p, 1, 1, &r); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2304 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2305 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2306 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2307 /* Draw the foreground of image glyph string S to PIXMAP. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2308 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2309 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2310 x_draw_image_foreground_1 (s, pixmap) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2311 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2312 Pixmap pixmap; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2313 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2314 int x; |
|
28785
796eafcfc070
(x_produce_image_glyph, x_draw_image_foreground)
Gerd Moellmann <gerd@gnu.org>
parents:
28686
diff
changeset
|
2315 int y = s->ybase - s->y - image_ascent (s->img, s->face); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2316 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2317 /* If first glyph of S has a left box line, start drawing it to the |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2318 right of that line. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2319 if (s->face->box != FACE_NO_BOX |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2320 && s->first_glyph->left_box_line_p) |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
2321 x = abs (s->face->box_line_width); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2322 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2323 x = 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2324 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2325 /* If there is a margin around the image, adjust x- and y-position |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2326 by that margin. */ |
|
35276
008aea836cbc
(x_produce_image_glyph, x_draw_image_foreground)
Gerd Moellmann <gerd@gnu.org>
parents:
35272
diff
changeset
|
2327 x += s->img->hmargin; |
|
008aea836cbc
(x_produce_image_glyph, x_draw_image_foreground)
Gerd Moellmann <gerd@gnu.org>
parents:
35272
diff
changeset
|
2328 y += s->img->vmargin; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2329 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2330 if (s->img->pixmap) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2331 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2332 if (s->img->mask) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2333 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2334 /* We can't set both a clip mask and use XSetClipRectangles |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2335 because the latter also sets a clip mask. We also can't |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2336 trust on the shape extension to be available |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2337 (XShapeCombineRegion). So, compute the rectangle to draw |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2338 manually. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2339 unsigned long mask = (GCClipMask | GCClipXOrigin | GCClipYOrigin |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2340 | GCFunction); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2341 XGCValues xgcv; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2342 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2343 xgcv.clip_mask = s->img->mask; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2344 xgcv.clip_x_origin = x; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2345 xgcv.clip_y_origin = y; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2346 xgcv.function = GXcopy; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2347 XChangeGC (s->display, s->gc, mask, &xgcv); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2348 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2349 XCopyArea (s->display, s->img->pixmap, pixmap, s->gc, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2350 0, 0, s->img->width, s->img->height, x, y); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2351 XSetClipMask (s->display, s->gc, None); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2352 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2353 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2354 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2355 XCopyArea (s->display, s->img->pixmap, pixmap, s->gc, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2356 0, 0, s->img->width, s->img->height, x, y); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2357 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2358 /* When the image has a mask, we can expect that at |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2359 least part of a mouse highlight or a block cursor will |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2360 be visible. If the image doesn't have a mask, make |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2361 a block cursor visible by drawing a rectangle around |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2362 the image. I believe it's looking better if we do |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2363 nothing here for mouse-face. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2364 if (s->hl == DRAW_CURSOR) |
|
45197
0b6da8b7d7ac
(x_draw_image_foreground, x_draw_image_foreground_1):
Kim F. Storm <storm@cua.dk>
parents:
44974
diff
changeset
|
2365 { |
|
0b6da8b7d7ac
(x_draw_image_foreground, x_draw_image_foreground_1):
Kim F. Storm <storm@cua.dk>
parents:
44974
diff
changeset
|
2366 int r = s->img->relief; |
|
0b6da8b7d7ac
(x_draw_image_foreground, x_draw_image_foreground_1):
Kim F. Storm <storm@cua.dk>
parents:
44974
diff
changeset
|
2367 if (r < 0) r = -r; |
|
0b6da8b7d7ac
(x_draw_image_foreground, x_draw_image_foreground_1):
Kim F. Storm <storm@cua.dk>
parents:
44974
diff
changeset
|
2368 XDrawRectangle (s->display, s->window, s->gc, x - r, y - r, |
|
0b6da8b7d7ac
(x_draw_image_foreground, x_draw_image_foreground_1):
Kim F. Storm <storm@cua.dk>
parents:
44974
diff
changeset
|
2369 s->img->width + r*2 - 1, s->img->height + r*2 - 1); |
|
0b6da8b7d7ac
(x_draw_image_foreground, x_draw_image_foreground_1):
Kim F. Storm <storm@cua.dk>
parents:
44974
diff
changeset
|
2370 } |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2371 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2372 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2373 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2374 /* Draw a rectangle if image could not be loaded. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2375 XDrawRectangle (s->display, pixmap, s->gc, x, y, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2376 s->img->width - 1, s->img->height - 1); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2377 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2378 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2379 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2380 /* Draw part of the background of glyph string S. X, Y, W, and H |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2381 give the rectangle to draw. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2382 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2383 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2384 x_draw_glyph_string_bg_rect (s, x, y, w, h) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2385 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2386 int x, y, w, h; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2387 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2388 if (s->stippled_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2389 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2390 /* Fill background with a stipple pattern. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2391 XSetFillStyle (s->display, s->gc, FillOpaqueStippled); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2392 XFillRectangle (s->display, s->window, s->gc, x, y, w, h); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2393 XSetFillStyle (s->display, s->gc, FillSolid); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2394 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2395 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2396 x_clear_glyph_string_rect (s, x, y, w, h); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2397 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2398 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2399 |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2400 /* Draw image glyph string S. |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2401 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2402 s->y |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2403 s->x +------------------------- |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2404 | s->face->box |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2405 | |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2406 | +------------------------- |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2407 | | s->img->margin |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2408 | | |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2409 | | +------------------- |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2410 | | | the image |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2411 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2412 */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2413 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2414 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2415 x_draw_image_glyph_string (s) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2416 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2417 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2418 int x, y; |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
2419 int box_line_hwidth = abs (s->face->box_line_width); |
|
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
2420 int box_line_vwidth = max (s->face->box_line_width, 0); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2421 int height; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2422 Pixmap pixmap = None; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2423 |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
2424 height = s->height - 2 * box_line_vwidth; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2425 |
| 49322 | 2426 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2427 /* Fill background with face under the image. Do it only if row is |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2428 taller than image or if image has a clip mask to reduce |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2429 flickering. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2430 s->stippled_p = s->face->stipple != 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2431 if (height > s->img->height |
|
35276
008aea836cbc
(x_produce_image_glyph, x_draw_image_foreground)
Gerd Moellmann <gerd@gnu.org>
parents:
35272
diff
changeset
|
2432 || s->img->hmargin |
|
008aea836cbc
(x_produce_image_glyph, x_draw_image_foreground)
Gerd Moellmann <gerd@gnu.org>
parents:
35272
diff
changeset
|
2433 || s->img->vmargin |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2434 || s->img->mask |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2435 || s->img->pixmap == 0 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2436 || s->width != s->background_width) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2437 { |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
2438 if (box_line_hwidth && s->first_glyph->left_box_line_p) |
|
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
2439 x = s->x + box_line_hwidth; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2440 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2441 x = s->x; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2442 |
|
36005
58a1ada9bf57
(x_produce_image_glyph): Pay attention to the case that
Kenichi Handa <handa@m17n.org>
parents:
35897
diff
changeset
|
2443 y = s->y + box_line_vwidth; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2444 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2445 if (s->img->mask) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2446 { |
|
31694
97c48afc4c5a
(x_draw_image_glyph_string): Remove a comment describing
Gerd Moellmann <gerd@gnu.org>
parents:
31614
diff
changeset
|
2447 /* Create a pixmap as large as the glyph string. Fill it |
|
97c48afc4c5a
(x_draw_image_glyph_string): Remove a comment describing
Gerd Moellmann <gerd@gnu.org>
parents:
31614
diff
changeset
|
2448 with the background color. Copy the image to it, using |
|
97c48afc4c5a
(x_draw_image_glyph_string): Remove a comment describing
Gerd Moellmann <gerd@gnu.org>
parents:
31614
diff
changeset
|
2449 its mask. Copy the temporary pixmap to the display. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2450 Screen *screen = FRAME_X_SCREEN (s->f); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2451 int depth = DefaultDepthOfScreen (screen); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2452 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2453 /* Create a pixmap as large as the glyph string. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2454 pixmap = XCreatePixmap (s->display, s->window, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2455 s->background_width, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2456 s->height, depth); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2457 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2458 /* Don't clip in the following because we're working on the |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2459 pixmap. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2460 XSetClipMask (s->display, s->gc, None); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2461 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2462 /* Fill the pixmap with the background color/stipple. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2463 if (s->stippled_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2464 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2465 /* Fill background with a stipple pattern. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2466 XSetFillStyle (s->display, s->gc, FillOpaqueStippled); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2467 XFillRectangle (s->display, pixmap, s->gc, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2468 0, 0, s->background_width, s->height); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2469 XSetFillStyle (s->display, s->gc, FillSolid); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2470 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2471 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2472 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2473 XGCValues xgcv; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2474 XGetGCValues (s->display, s->gc, GCForeground | GCBackground, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2475 &xgcv); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2476 XSetForeground (s->display, s->gc, xgcv.background); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2477 XFillRectangle (s->display, pixmap, s->gc, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2478 0, 0, s->background_width, s->height); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2479 XSetForeground (s->display, s->gc, xgcv.foreground); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2480 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2481 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2482 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2483 x_draw_glyph_string_bg_rect (s, x, y, s->background_width, height); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2484 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2485 s->background_filled_p = 1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2486 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2487 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2488 /* Draw the foreground. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2489 if (pixmap != None) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2490 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2491 x_draw_image_foreground_1 (s, pixmap); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2492 x_set_glyph_string_clipping (s); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2493 XCopyArea (s->display, pixmap, s->window, s->gc, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2494 0, 0, s->background_width, s->height, s->x, s->y); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2495 XFreePixmap (s->display, pixmap); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2496 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2497 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2498 x_draw_image_foreground (s); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2499 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2500 /* If we must draw a relief around the image, do it. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2501 if (s->img->relief |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2502 || s->hl == DRAW_IMAGE_RAISED |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2503 || s->hl == DRAW_IMAGE_SUNKEN) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2504 x_draw_image_relief (s); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2505 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2506 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2507 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2508 /* Draw stretch glyph string S. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2509 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2510 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2511 x_draw_stretch_glyph_string (s) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2512 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2513 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2514 xassert (s->first_glyph->type == STRETCH_GLYPH); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2515 s->stippled_p = s->face->stipple != 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2516 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2517 if (s->hl == DRAW_CURSOR |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2518 && !x_stretch_cursor_p) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2519 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2520 /* If `x-stretch-block-cursor' is nil, don't draw a block cursor |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2521 as wide as the stretch glyph. */ |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
2522 int width = min (FRAME_COLUMN_WIDTH (s->f), s->background_width); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2523 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2524 /* Draw cursor. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2525 x_draw_glyph_string_bg_rect (s, s->x, s->y, width, s->height); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2526 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2527 /* Clear rest using the GC of the original non-cursor face. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2528 if (width < s->background_width) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2529 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2530 int x = s->x + width, y = s->y; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2531 int w = s->background_width - width, h = s->height; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2532 XRectangle r; |
|
37922
fcd11c3e6341
(cursor_in_mouse_face_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37726
diff
changeset
|
2533 GC gc; |
|
fcd11c3e6341
(cursor_in_mouse_face_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37726
diff
changeset
|
2534 |
|
fcd11c3e6341
(cursor_in_mouse_face_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37726
diff
changeset
|
2535 if (s->row->mouse_face_p |
|
fcd11c3e6341
(cursor_in_mouse_face_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37726
diff
changeset
|
2536 && cursor_in_mouse_face_p (s->w)) |
|
fcd11c3e6341
(cursor_in_mouse_face_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37726
diff
changeset
|
2537 { |
|
fcd11c3e6341
(cursor_in_mouse_face_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37726
diff
changeset
|
2538 x_set_mouse_face_gc (s); |
|
fcd11c3e6341
(cursor_in_mouse_face_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37726
diff
changeset
|
2539 gc = s->gc; |
|
fcd11c3e6341
(cursor_in_mouse_face_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37726
diff
changeset
|
2540 } |
|
fcd11c3e6341
(cursor_in_mouse_face_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37726
diff
changeset
|
2541 else |
|
fcd11c3e6341
(cursor_in_mouse_face_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37726
diff
changeset
|
2542 gc = s->face->gc; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2543 |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2544 get_glyph_string_clip_rect (s, &r); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2545 XSetClipRectangles (s->display, gc, 0, 0, &r, 1, Unsorted); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2546 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2547 if (s->face->stipple) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2548 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2549 /* Fill background with a stipple pattern. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2550 XSetFillStyle (s->display, gc, FillOpaqueStippled); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2551 XFillRectangle (s->display, s->window, gc, x, y, w, h); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2552 XSetFillStyle (s->display, gc, FillSolid); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2553 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2554 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2555 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2556 XGCValues xgcv; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2557 XGetGCValues (s->display, gc, GCForeground | GCBackground, &xgcv); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2558 XSetForeground (s->display, gc, xgcv.background); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2559 XFillRectangle (s->display, s->window, gc, x, y, w, h); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2560 XSetForeground (s->display, gc, xgcv.foreground); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2561 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2562 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2563 } |
|
37535
6c6b5bd0f257
(x_draw_stretch_glyph_string): Don't draw background
Gerd Moellmann <gerd@gnu.org>
parents:
37525
diff
changeset
|
2564 else if (!s->background_filled_p) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2565 x_draw_glyph_string_bg_rect (s, s->x, s->y, s->background_width, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2566 s->height); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2567 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2568 s->background_filled_p = 1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2569 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2570 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2571 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2572 /* Draw glyph string S. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2573 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2574 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2575 x_draw_glyph_string (s) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2576 struct glyph_string *s; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2577 { |
|
36800
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2578 int relief_drawn_p = 0; |
|
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2579 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2580 /* If S draws into the background of its successor, draw the |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2581 background of the successor first so that S can draw into it. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2582 This makes S->next use XDrawString instead of XDrawImageString. */ |
|
25189
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2583 if (s->next && s->right_overhang && !s->for_overlaps_p) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2584 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2585 xassert (s->next->img == NULL); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2586 x_set_glyph_string_gc (s->next); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2587 x_set_glyph_string_clipping (s->next); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2588 x_draw_glyph_string_background (s->next, 1); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2589 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2590 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2591 /* Set up S->gc, set clipping and draw S. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2592 x_set_glyph_string_gc (s); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2593 |
|
36800
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2594 /* Draw relief (if any) in advance for char/composition so that the |
|
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2595 glyph string can be drawn over it. */ |
|
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2596 if (!s->for_overlaps_p |
|
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2597 && s->face->box != FACE_NO_BOX |
|
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2598 && (s->first_glyph->type == CHAR_GLYPH |
|
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2599 || s->first_glyph->type == COMPOSITE_GLYPH)) |
|
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2600 |
|
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2601 { |
|
39950
df00f7799bb7
(x_draw_glyph_string): Restore clipping after
Gerd Moellmann <gerd@gnu.org>
parents:
39922
diff
changeset
|
2602 x_set_glyph_string_clipping (s); |
|
36800
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2603 x_draw_glyph_string_background (s, 1); |
|
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2604 x_draw_glyph_string_box (s); |
|
39950
df00f7799bb7
(x_draw_glyph_string): Restore clipping after
Gerd Moellmann <gerd@gnu.org>
parents:
39922
diff
changeset
|
2605 x_set_glyph_string_clipping (s); |
|
36800
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2606 relief_drawn_p = 1; |
|
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2607 } |
|
39950
df00f7799bb7
(x_draw_glyph_string): Restore clipping after
Gerd Moellmann <gerd@gnu.org>
parents:
39922
diff
changeset
|
2608 else |
|
df00f7799bb7
(x_draw_glyph_string): Restore clipping after
Gerd Moellmann <gerd@gnu.org>
parents:
39922
diff
changeset
|
2609 x_set_glyph_string_clipping (s); |
|
36800
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2610 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2611 switch (s->first_glyph->type) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2612 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2613 case IMAGE_GLYPH: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2614 x_draw_image_glyph_string (s); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2615 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2616 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2617 case STRETCH_GLYPH: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2618 x_draw_stretch_glyph_string (s); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2619 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2620 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2621 case CHAR_GLYPH: |
|
25189
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2622 if (s->for_overlaps_p) |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2623 s->background_filled_p = 1; |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2624 else |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2625 x_draw_glyph_string_background (s, 0); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2626 x_draw_glyph_string_foreground (s); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2627 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2628 |
|
26879
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
2629 case COMPOSITE_GLYPH: |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
2630 if (s->for_overlaps_p || s->gidx > 0) |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
2631 s->background_filled_p = 1; |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
2632 else |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
2633 x_draw_glyph_string_background (s, 1); |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
2634 x_draw_composite_glyph_string_foreground (s); |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
2635 break; |
|
b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
Kenichi Handa <handa@m17n.org>
parents:
26829
diff
changeset
|
2636 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2637 default: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2638 abort (); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2639 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2640 |
|
25189
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2641 if (!s->for_overlaps_p) |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2642 { |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2643 /* Draw underline. */ |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2644 if (s->face->underline_p) |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2645 { |
|
32945
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2646 unsigned long tem, h; |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2647 int y; |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2648 |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2649 /* Get the underline thickness. Default is 1 pixel. */ |
|
25189
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2650 if (!XGetFontProperty (s->font, XA_UNDERLINE_THICKNESS, &h)) |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2651 h = 1; |
|
32945
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2652 |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2653 /* Get the underline position. This is the recommended |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2654 vertical offset in pixels from the baseline to the top of |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2655 the underline. This is a signed value according to the |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2656 specs, and its default is |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2657 |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2658 ROUND ((maximum descent) / 2), with |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2659 ROUND(x) = floor (x + 0.5) */ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2660 |
|
37153
3799cab1815b
(x_use_underline_position_properties): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37143
diff
changeset
|
2661 if (x_use_underline_position_properties |
|
3799cab1815b
(x_use_underline_position_properties): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37143
diff
changeset
|
2662 && XGetFontProperty (s->font, XA_UNDERLINE_POSITION, &tem)) |
|
32945
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2663 y = s->ybase + (long) tem; |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2664 else if (s->face->font) |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2665 y = s->ybase + (s->face->font->max_bounds.descent + 1) / 2; |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2666 else |
|
37031
5cb404651755
(expose_window_tree, expose_frame): Don't compute
Gerd Moellmann <gerd@gnu.org>
parents:
36948
diff
changeset
|
2667 y = s->y + s->height - h; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2668 |
|
25189
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2669 if (s->face->underline_defaulted_p) |
|
32945
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2670 XFillRectangle (s->display, s->window, s->gc, |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2671 s->x, y, s->width, h); |
|
25189
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2672 else |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2673 { |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2674 XGCValues xgcv; |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2675 XGetGCValues (s->display, s->gc, GCForeground, &xgcv); |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2676 XSetForeground (s->display, s->gc, s->face->underline_color); |
|
32945
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2677 XFillRectangle (s->display, s->window, s->gc, |
|
1b418a786c41
(x_draw_glyph_string): Treat XA_UNDERLINE_POSITION as a
Gerd Moellmann <gerd@gnu.org>
parents:
32938
diff
changeset
|
2678 s->x, y, s->width, h); |
|
25189
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2679 XSetForeground (s->display, s->gc, xgcv.foreground); |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2680 } |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2681 } |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2682 |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2683 /* Draw overline. */ |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2684 if (s->face->overline_p) |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2685 { |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2686 unsigned long dy = 0, h = 1; |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2687 |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2688 if (s->face->overline_color_defaulted_p) |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2689 XFillRectangle (s->display, s->window, s->gc, s->x, s->y + dy, |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2690 s->width, h); |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2691 else |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2692 { |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2693 XGCValues xgcv; |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2694 XGetGCValues (s->display, s->gc, GCForeground, &xgcv); |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2695 XSetForeground (s->display, s->gc, s->face->overline_color); |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2696 XFillRectangle (s->display, s->window, s->gc, s->x, s->y + dy, |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2697 s->width, h); |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2698 XSetForeground (s->display, s->gc, xgcv.foreground); |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2699 } |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2700 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2701 |
|
25189
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2702 /* Draw strike-through. */ |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2703 if (s->face->strike_through_p) |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2704 { |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2705 unsigned long h = 1; |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2706 unsigned long dy = (s->height - h) / 2; |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2707 |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2708 if (s->face->strike_through_color_defaulted_p) |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2709 XFillRectangle (s->display, s->window, s->gc, s->x, s->y + dy, |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2710 s->width, h); |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2711 else |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2712 { |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2713 XGCValues xgcv; |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2714 XGetGCValues (s->display, s->gc, GCForeground, &xgcv); |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2715 XSetForeground (s->display, s->gc, s->face->strike_through_color); |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2716 XFillRectangle (s->display, s->window, s->gc, s->x, s->y + dy, |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2717 s->width, h); |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2718 XSetForeground (s->display, s->gc, xgcv.foreground); |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2719 } |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2720 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2721 |
|
36800
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2722 /* Draw relief if not yet drawn. */ |
|
7a809e9fc67e
(x_draw_glyph_string): Draw relief (if any) before
Kenichi Handa <handa@m17n.org>
parents:
36795
diff
changeset
|
2723 if (!relief_drawn_p && s->face->box != FACE_NO_BOX) |
|
25189
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2724 x_draw_glyph_string_box (s); |
|
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
2725 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2726 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2727 /* Reset clipping. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2728 XSetClipMask (s->display, s->gc, None); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2729 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2730 |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2731 /* Shift display to make room for inserted glyphs. */ |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2732 |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2733 void |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2734 x_shift_glyphs_for_insert (f, x, y, width, height, shift_by) |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2735 struct frame *f; |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2736 int x, y, width, height, shift_by; |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2737 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2738 XCopyArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), FRAME_X_WINDOW (f), |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2739 f->output_data.x->normal_gc, |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2740 x, y, width, height, |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2741 x + shift_by, y); |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
2742 } |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2743 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2744 /* Delete N glyphs at the nominal cursor position. Not implemented |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2745 for X frames. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2746 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2747 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2748 x_delete_glyphs (n) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2749 register int n; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2750 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2751 abort (); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2752 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2753 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2754 |
|
35581
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2755 /* Like XClearArea, but check that WIDTH and HEIGHT are reasonable. |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2756 If they are <= 0, this is probably an error. */ |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2757 |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2758 void |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2759 x_clear_area (dpy, window, x, y, width, height, exposures) |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2760 Display *dpy; |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2761 Window window; |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2762 int x, y; |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2763 int width, height; |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2764 int exposures; |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2765 { |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2766 xassert (width > 0 && height > 0); |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2767 XClearArea (dpy, window, x, y, width, height, exposures); |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2768 } |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2769 |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
2770 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2771 /* Clear entire frame. If updating_frame is non-null, clear that |
|
25682
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
2772 frame. Otherwise clear the selected frame. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2773 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2774 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2775 x_clear_frame () |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2776 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2777 struct frame *f; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2778 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2779 if (updating_frame) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2780 f = updating_frame; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2781 else |
|
25682
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
2782 f = SELECTED_FRAME (); |
| 771 | 2783 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2784 /* Clearing the frame will erase any cursor, so mark them all as no |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2785 longer visible. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2786 mark_window_cursors_off (XWINDOW (FRAME_ROOT_WINDOW (f))); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2787 output_cursor.hpos = output_cursor.vpos = 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2788 output_cursor.x = -1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2789 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2790 /* We don't set the output cursor here because there will always |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2791 follow an explicit cursor_to. */ |
| 286 | 2792 BLOCK_INPUT; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
2793 XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2794 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
2795 /* We have to clear the scroll bars, too. If we have changed |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2796 colors or something like that, then they should be notified. */ |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
2797 x_scroll_bar_clear (f); |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2798 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
2799 XFlush (FRAME_X_DISPLAY (f)); |
|
50130
66a7f2850b56
Clear frame didn't redraw scrollbars, fixed that.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50103
diff
changeset
|
2800 |
|
66a7f2850b56
Clear frame didn't redraw scrollbars, fixed that.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50103
diff
changeset
|
2801 #ifdef USE_GTK |
|
66a7f2850b56
Clear frame didn't redraw scrollbars, fixed that.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50103
diff
changeset
|
2802 xg_frame_cleared (f); |
|
66a7f2850b56
Clear frame didn't redraw scrollbars, fixed that.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50103
diff
changeset
|
2803 #endif |
|
66a7f2850b56
Clear frame didn't redraw scrollbars, fixed that.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50103
diff
changeset
|
2804 |
| 286 | 2805 UNBLOCK_INPUT; |
| 2806 } | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2807 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2808 |
|
6791
7036e4fd549f
(dumpglyphs): Clear any extra pixel rows below the text.
Richard M. Stallman <rms@gnu.org>
parents:
6767
diff
changeset
|
2809 |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2810 /* Invert the middle quarter of the frame for .15 sec. */ |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2811 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2812 /* We use the select system call to do the waiting, so we have to make |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2813 sure it's available. If it isn't, we just won't do visual bells. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2814 |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2815 #if defined (HAVE_TIMEVAL) && defined (HAVE_SELECT) |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2816 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2817 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2818 /* Subtract the `struct timeval' values X and Y, storing the result in |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2819 *RESULT. Return 1 if the difference is negative, otherwise 0. */ |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2820 |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2821 static int |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2822 timeval_subtract (result, x, y) |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2823 struct timeval *result, x, y; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2824 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2825 /* Perform the carry for the later subtraction by updating y. This |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2826 is safer because on some systems the tv_sec member is unsigned. */ |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2827 if (x.tv_usec < y.tv_usec) |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2828 { |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2829 int nsec = (y.tv_usec - x.tv_usec) / 1000000 + 1; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2830 y.tv_usec -= 1000000 * nsec; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2831 y.tv_sec += nsec; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2832 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2833 |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2834 if (x.tv_usec - y.tv_usec > 1000000) |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2835 { |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2836 int nsec = (y.tv_usec - x.tv_usec) / 1000000; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2837 y.tv_usec += 1000000 * nsec; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2838 y.tv_sec -= nsec; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2839 } |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2840 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2841 /* Compute the time remaining to wait. tv_usec is certainly |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2842 positive. */ |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2843 result->tv_sec = x.tv_sec - y.tv_sec; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2844 result->tv_usec = x.tv_usec - y.tv_usec; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2845 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2846 /* Return indication of whether the result should be considered |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2847 negative. */ |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2848 return x.tv_sec < y.tv_sec; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2849 } |
| 286 | 2850 |
| 21514 | 2851 void |
| 771 | 2852 XTflash (f) |
| 2853 struct frame *f; | |
| 286 | 2854 { |
| 2855 BLOCK_INPUT; | |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2856 |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2857 { |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2858 GC gc; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2859 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2860 /* Create a GC that will use the GXxor function to flip foreground |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2861 pixels into background pixels. */ |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2862 { |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2863 XGCValues values; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2864 |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2865 values.function = GXxor; |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
2866 values.foreground = (f->output_data.x->foreground_pixel |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
2867 ^ f->output_data.x->background_pixel); |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
2868 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
2869 gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2870 GCFunction | GCForeground, &values); |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2871 } |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2872 |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2873 { |
|
16352
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2874 /* Get the height not including a menu bar widget. */ |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
2875 int height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, FRAME_LINES (f)); |
|
16352
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2876 /* Height of each line to flash. */ |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2877 int flash_height = FRAME_LINE_HEIGHT (f); |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2878 /* These will be the left and right margins of the rectangles. */ |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2879 int flash_left = FRAME_INTERNAL_BORDER_WIDTH (f); |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
2880 int flash_right = FRAME_PIXEL_WIDTH (f) - FRAME_INTERNAL_BORDER_WIDTH (f); |
|
16352
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2881 |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2882 int width; |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2883 |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2884 /* Don't flash the area between a scroll bar and the frame |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2885 edge it is next to. */ |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2886 switch (FRAME_VERTICAL_SCROLL_BAR_TYPE (f)) |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2887 { |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2888 case vertical_scroll_bar_left: |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2889 flash_left += VERTICAL_SCROLL_BAR_WIDTH_TRIM; |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2890 break; |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2891 |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2892 case vertical_scroll_bar_right: |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2893 flash_right -= VERTICAL_SCROLL_BAR_WIDTH_TRIM; |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2894 break; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2895 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2896 default: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2897 break; |
|
16352
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2898 } |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2899 |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2900 width = flash_right - flash_left; |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2901 |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2902 /* If window is tall, flash top and bottom line. */ |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2903 if (height > 3 * FRAME_LINE_HEIGHT (f)) |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2904 { |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2905 XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), gc, |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2906 flash_left, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2907 (FRAME_INTERNAL_BORDER_WIDTH (f) |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
2908 + FRAME_TOOL_BAR_LINES (f) * FRAME_LINE_HEIGHT (f)), |
|
16352
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2909 width, flash_height); |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2910 XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), gc, |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2911 flash_left, |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2912 (height - flash_height |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2913 - FRAME_INTERNAL_BORDER_WIDTH (f)), |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2914 width, flash_height); |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2915 } |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2916 else |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2917 /* If it is short, flash it all. */ |
|
16352
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2918 XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), gc, |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2919 flash_left, FRAME_INTERNAL_BORDER_WIDTH (f), |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2920 width, height - 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2921 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2922 x_flush (f); |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2923 |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2924 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2925 struct timeval wakeup; |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2926 |
|
5362
d1fa597d923d
(XTflush): FIx typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
5357
diff
changeset
|
2927 EMACS_GET_TIME (wakeup); |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2928 |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2929 /* Compute time to wait until, propagating carry from usecs. */ |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2930 wakeup.tv_usec += 150000; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2931 wakeup.tv_sec += (wakeup.tv_usec / 1000000); |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2932 wakeup.tv_usec %= 1000000; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2933 |
|
36599
3813a1116259
(XTflash): Make the timeout of select shorter, and call
Gerd Moellmann <gerd@gnu.org>
parents:
36587
diff
changeset
|
2934 /* Keep waiting until past the time wakeup or any input gets |
|
3813a1116259
(XTflash): Make the timeout of select shorter, and call
Gerd Moellmann <gerd@gnu.org>
parents:
36587
diff
changeset
|
2935 available. */ |
|
3813a1116259
(XTflash): Make the timeout of select shorter, and call
Gerd Moellmann <gerd@gnu.org>
parents:
36587
diff
changeset
|
2936 while (! detect_input_pending ()) |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2937 { |
|
36599
3813a1116259
(XTflash): Make the timeout of select shorter, and call
Gerd Moellmann <gerd@gnu.org>
parents:
36587
diff
changeset
|
2938 struct timeval current; |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2939 struct timeval timeout; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2940 |
|
36599
3813a1116259
(XTflash): Make the timeout of select shorter, and call
Gerd Moellmann <gerd@gnu.org>
parents:
36587
diff
changeset
|
2941 EMACS_GET_TIME (current); |
|
3813a1116259
(XTflash): Make the timeout of select shorter, and call
Gerd Moellmann <gerd@gnu.org>
parents:
36587
diff
changeset
|
2942 |
|
3813a1116259
(XTflash): Make the timeout of select shorter, and call
Gerd Moellmann <gerd@gnu.org>
parents:
36587
diff
changeset
|
2943 /* Break if result would be negative. */ |
|
3813a1116259
(XTflash): Make the timeout of select shorter, and call
Gerd Moellmann <gerd@gnu.org>
parents:
36587
diff
changeset
|
2944 if (timeval_subtract (¤t, wakeup, current)) |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2945 break; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2946 |
|
36599
3813a1116259
(XTflash): Make the timeout of select shorter, and call
Gerd Moellmann <gerd@gnu.org>
parents:
36587
diff
changeset
|
2947 /* How long `select' should wait. */ |
|
3813a1116259
(XTflash): Make the timeout of select shorter, and call
Gerd Moellmann <gerd@gnu.org>
parents:
36587
diff
changeset
|
2948 timeout.tv_sec = 0; |
|
3813a1116259
(XTflash): Make the timeout of select shorter, and call
Gerd Moellmann <gerd@gnu.org>
parents:
36587
diff
changeset
|
2949 timeout.tv_usec = 10000; |
|
3813a1116259
(XTflash): Make the timeout of select shorter, and call
Gerd Moellmann <gerd@gnu.org>
parents:
36587
diff
changeset
|
2950 |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2951 /* Try to wait that long--but we might wake up sooner. */ |
|
11915
e2ab839155e1
(XTflash): Use pointers as args to select.
Karl Heuer <kwzh@gnu.org>
parents:
11904
diff
changeset
|
2952 select (0, NULL, NULL, NULL, &timeout); |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2953 } |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2954 } |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
2955 |
|
16352
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2956 /* If window is tall, flash top and bottom line. */ |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2957 if (height > 3 * FRAME_LINE_HEIGHT (f)) |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2958 { |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2959 XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), gc, |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2960 flash_left, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2961 (FRAME_INTERNAL_BORDER_WIDTH (f) |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
2962 + FRAME_TOOL_BAR_LINES (f) * FRAME_LINE_HEIGHT (f)), |
|
16352
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2963 width, flash_height); |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2964 XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), gc, |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2965 flash_left, |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2966 (height - flash_height |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2967 - FRAME_INTERNAL_BORDER_WIDTH (f)), |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2968 width, flash_height); |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2969 } |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2970 else |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2971 /* If it is short, flash it all. */ |
|
16352
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2972 XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), gc, |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2973 flash_left, FRAME_INTERNAL_BORDER_WIDTH (f), |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2974 width, height - 2 * FRAME_INTERNAL_BORDER_WIDTH (f)); |
|
dfe3713f8c75
(XTflash): Don't flash in the internal borders.
Richard M. Stallman <rms@gnu.org>
parents:
16330
diff
changeset
|
2975 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
2976 XFreeGC (FRAME_X_DISPLAY (f), gc); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2977 x_flush (f); |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2978 } |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2979 } |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2980 |
| 286 | 2981 UNBLOCK_INPUT; |
| 2982 } | |
| 2983 | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
2984 #endif /* defined (HAVE_TIMEVAL) && defined (HAVE_SELECT) */ |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2985 |
| 286 | 2986 |
| 2987 /* Make audible bell. */ | |
| 2988 | |
| 21514 | 2989 void |
| 286 | 2990 XTring_bell () |
| 2991 { | |
|
25682
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
2992 struct frame *f = SELECTED_FRAME (); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
2993 |
|
25682
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
2994 if (FRAME_X_DISPLAY (f)) |
|
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
2995 { |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
2996 #if defined (HAVE_TIMEVAL) && defined (HAVE_SELECT) |
|
25682
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
2997 if (visible_bell) |
|
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
2998 XTflash (f); |
|
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
2999 else |
|
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
3000 #endif |
|
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
3001 { |
|
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
3002 BLOCK_INPUT; |
|
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
3003 XBell (FRAME_X_DISPLAY (f), 0); |
|
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
3004 XFlush (FRAME_X_DISPLAY (f)); |
|
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
3005 UNBLOCK_INPUT; |
|
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
3006 } |
| 286 | 3007 } |
| 3008 } | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3009 |
| 286 | 3010 |
| 3011 /* Specify how many text lines, from the top of the window, | |
| 3012 should be affected by insert-lines and delete-lines operations. | |
| 3013 This, and those operations, are used only within an update | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3014 that is bounded by calls to x_update_begin and x_update_end. */ |
| 286 | 3015 |
| 21514 | 3016 static void |
| 286 | 3017 XTset_terminal_window (n) |
| 3018 register int n; | |
| 3019 { | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3020 /* This function intentionally left blank. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3021 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3022 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3023 |
| 286 | 3024 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3025 /*********************************************************************** |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3026 Line Dance |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3027 ***********************************************************************/ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3028 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3029 /* Perform an insert-lines or delete-lines operation, inserting N |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3030 lines or deleting -N lines at vertical position VPOS. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3031 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3032 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3033 x_ins_del_lines (vpos, n) |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
3034 int vpos, n; |
| 286 | 3035 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3036 abort (); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3037 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3038 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3039 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3040 /* Scroll part of the display as described by RUN. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3041 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3042 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3043 x_scroll_run (w, run) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3044 struct window *w; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3045 struct run *run; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3046 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3047 struct frame *f = XFRAME (w->frame); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3048 int x, y, width, height, from_y, to_y, bottom_y; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3049 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3050 /* Get frame-relative bounding box of the text display area of W, |
| 41134 | 3051 without mode lines. Include in this box the left and right |
| 3052 fringe of W. */ | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3053 window_box (w, -1, &x, &y, &width, &height); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3054 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3055 from_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->current_y); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3056 to_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->desired_y); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3057 bottom_y = y + height; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3058 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3059 if (to_y < from_y) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3060 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3061 /* Scrolling up. Make sure we don't copy part of the mode |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3062 line at the bottom. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3063 if (from_y + run->height > bottom_y) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3064 height = bottom_y - from_y; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3065 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3066 height = run->height; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3067 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3068 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3069 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3070 /* Scolling down. Make sure we don't copy over the mode line. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3071 at the bottom. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3072 if (to_y + run->height > bottom_y) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3073 height = bottom_y - to_y; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3074 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3075 height = run->height; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3076 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3077 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3078 BLOCK_INPUT; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3079 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3080 /* Cursor off. Will be switched on again in x_update_window_end. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3081 updated_window = w; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3082 x_clear_cursor (w); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3083 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3084 XCopyArea (FRAME_X_DISPLAY (f), |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3085 FRAME_X_WINDOW (f), FRAME_X_WINDOW (f), |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3086 f->output_data.x->normal_gc, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3087 x, from_y, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3088 width, height, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3089 x, to_y); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3090 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3091 UNBLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3092 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3093 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3094 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3095 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3096 /*********************************************************************** |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3097 Exposure Events |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3098 ***********************************************************************/ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3099 |
| 286 | 3100 |
| 3101 static void | |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3102 frame_highlight (f) |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3103 struct frame *f; |
| 286 | 3104 { |
|
3943
cbdf67dd68d0
* xterm.c (frame_highlight, frame_unhighlight): Don't test
Jim Blandy <jimb@redhat.com>
parents:
3938
diff
changeset
|
3105 /* We used to only do this if Vx_no_window_manager was non-nil, but |
|
cbdf67dd68d0
* xterm.c (frame_highlight, frame_unhighlight): Don't test
Jim Blandy <jimb@redhat.com>
parents:
3938
diff
changeset
|
3106 the ICCCM (section 4.1.6) says that the window's border pixmap |
|
cbdf67dd68d0
* xterm.c (frame_highlight, frame_unhighlight): Don't test
Jim Blandy <jimb@redhat.com>
parents:
3938
diff
changeset
|
3107 and border pixel are window attributes which are "private to the |
|
cbdf67dd68d0
* xterm.c (frame_highlight, frame_unhighlight): Don't test
Jim Blandy <jimb@redhat.com>
parents:
3938
diff
changeset
|
3108 client", so we can always change it to whatever we want. */ |
|
cbdf67dd68d0
* xterm.c (frame_highlight, frame_unhighlight): Don't test
Jim Blandy <jimb@redhat.com>
parents:
3938
diff
changeset
|
3109 BLOCK_INPUT; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3110 XSetWindowBorder (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
3111 f->output_data.x->border_pixel); |
|
3943
cbdf67dd68d0
* xterm.c (frame_highlight, frame_unhighlight): Don't test
Jim Blandy <jimb@redhat.com>
parents:
3938
diff
changeset
|
3112 UNBLOCK_INPUT; |
|
12431
80a5aedfb4c7
(XTread_socket): Turn off meta, super, hyper and alt bits
Richard M. Stallman <rms@gnu.org>
parents:
12192
diff
changeset
|
3113 x_update_cursor (f, 1); |
| 286 | 3114 } |
| 3115 | |
| 3116 static void | |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3117 frame_unhighlight (f) |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3118 struct frame *f; |
| 286 | 3119 { |
|
3943
cbdf67dd68d0
* xterm.c (frame_highlight, frame_unhighlight): Don't test
Jim Blandy <jimb@redhat.com>
parents:
3938
diff
changeset
|
3120 /* We used to only do this if Vx_no_window_manager was non-nil, but |
|
cbdf67dd68d0
* xterm.c (frame_highlight, frame_unhighlight): Don't test
Jim Blandy <jimb@redhat.com>
parents:
3938
diff
changeset
|
3121 the ICCCM (section 4.1.6) says that the window's border pixmap |
|
cbdf67dd68d0
* xterm.c (frame_highlight, frame_unhighlight): Don't test
Jim Blandy <jimb@redhat.com>
parents:
3938
diff
changeset
|
3122 and border pixel are window attributes which are "private to the |
|
cbdf67dd68d0
* xterm.c (frame_highlight, frame_unhighlight): Don't test
Jim Blandy <jimb@redhat.com>
parents:
3938
diff
changeset
|
3123 client", so we can always change it to whatever we want. */ |
|
cbdf67dd68d0
* xterm.c (frame_highlight, frame_unhighlight): Don't test
Jim Blandy <jimb@redhat.com>
parents:
3938
diff
changeset
|
3124 BLOCK_INPUT; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3125 XSetWindowBorderPixmap (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
3126 f->output_data.x->border_tile); |
|
3943
cbdf67dd68d0
* xterm.c (frame_highlight, frame_unhighlight): Don't test
Jim Blandy <jimb@redhat.com>
parents:
3938
diff
changeset
|
3127 UNBLOCK_INPUT; |
|
12431
80a5aedfb4c7
(XTread_socket): Turn off meta, super, hyper and alt bits
Richard M. Stallman <rms@gnu.org>
parents:
12192
diff
changeset
|
3128 x_update_cursor (f, 1); |
| 286 | 3129 } |
| 3130 | |
| 771 | 3131 /* The focus has changed. Update the frames as necessary to reflect |
| 3132 the new situation. Note that we can't change the selected frame | |
|
10546
7515c28a59d9
(x_destroy_window): Don't let frame being destroyed remain in
Richard M. Stallman <rms@gnu.org>
parents:
10366
diff
changeset
|
3133 here, because the Lisp code we are interrupting might become confused. |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3585
diff
changeset
|
3134 Each event gets marked with the frame in which it occurred, so the |
|
10546
7515c28a59d9
(x_destroy_window): Don't let frame being destroyed remain in
Richard M. Stallman <rms@gnu.org>
parents:
10366
diff
changeset
|
3135 Lisp code can tell when the switch took place by examining the events. */ |
| 369 | 3136 |
| 3137 static void | |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3138 x_new_focus_frame (dpyinfo, frame) |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3139 struct x_display_info *dpyinfo; |
| 771 | 3140 struct frame *frame; |
| 286 | 3141 { |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3142 struct frame *old_focus = dpyinfo->x_focus_frame; |
| 286 | 3143 |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3144 if (frame != dpyinfo->x_focus_frame) |
| 286 | 3145 { |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
3146 /* Set this before calling other routines, so that they see |
| 771 | 3147 the correct value of x_focus_frame. */ |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3148 dpyinfo->x_focus_frame = frame; |
| 369 | 3149 |
| 3150 if (old_focus && old_focus->auto_lower) | |
| 771 | 3151 x_lower_frame (old_focus); |
| 286 | 3152 |
| 3153 #if 0 | |
| 771 | 3154 selected_frame = frame; |
|
9338
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
3155 XSETFRAME (XWINDOW (selected_frame->selected_window)->frame, |
|
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
3156 selected_frame); |
|
51048
7ac9c3bea5ea
(Fselect_window): Add optional arg `norecord'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50521
diff
changeset
|
3157 Fselect_window (selected_frame->selected_window, Qnil); |
| 771 | 3158 choose_minibuf_frame (); |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
3159 #endif /* ! 0 */ |
| 286 | 3160 |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3161 if (dpyinfo->x_focus_frame && dpyinfo->x_focus_frame->auto_raise) |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3162 pending_autoraise_frame = dpyinfo->x_focus_frame; |
|
6883
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
3163 else |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
3164 pending_autoraise_frame = 0; |
| 369 | 3165 } |
| 3166 | |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3167 x_frame_rehighlight (dpyinfo); |
| 369 | 3168 } |
| 3169 | |
|
46076
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3170 /* Handle FocusIn and FocusOut state changes for FRAME. |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3171 If FRAME has focus and there exists more than one frame, puts |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3172 a FOCUS_IN_EVENT into *BUFP. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3173 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3174 static void |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3175 x_focus_changed (type, state, dpyinfo, frame, bufp) |
|
46076
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3176 int type; |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3177 int state; |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3178 struct x_display_info *dpyinfo; |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3179 struct frame *frame; |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3180 struct input_event *bufp; |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3181 { |
|
46076
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3182 if (type == FocusIn) |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3183 { |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3184 if (dpyinfo->x_focus_event_frame != frame) |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3185 { |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3186 x_new_focus_frame (dpyinfo, frame); |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3187 dpyinfo->x_focus_event_frame = frame; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3188 |
|
46076
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3189 /* Don't stop displaying the initial startup message |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3190 for a switch-frame event we don't need. */ |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3191 if (GC_NILP (Vterminal_frame) |
|
46076
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3192 && GC_CONSP (Vframe_list) |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3193 && !GC_NILP (XCDR (Vframe_list))) |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3194 { |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3195 bufp->kind = FOCUS_IN_EVENT; |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3196 XSETFRAME (bufp->frame_or_window, frame); |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3197 } |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3198 } |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3199 |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3200 frame->output_data.x->focus_state |= state; |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3201 |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3202 #ifdef HAVE_X_I18N |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3203 if (FRAME_XIC (frame)) |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3204 XSetICFocus (FRAME_XIC (frame)); |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3205 #endif |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3206 } |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3207 else if (type == FocusOut) |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3208 { |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3209 frame->output_data.x->focus_state &= ~state; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3210 |
|
46076
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3211 if (dpyinfo->x_focus_event_frame == frame) |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3212 { |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3213 dpyinfo->x_focus_event_frame = 0; |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3214 x_new_focus_frame (dpyinfo, 0); |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3215 } |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3216 |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3217 #ifdef HAVE_X_I18N |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3218 if (FRAME_XIC (frame)) |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3219 XUnsetICFocus (FRAME_XIC (frame)); |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3220 #endif |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3221 } |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3222 } |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3223 |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3224 /* The focus may have changed. Figure out if it is a real focus change, |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3225 by checking both FocusIn/Out and Enter/LeaveNotify events. |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3226 |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3227 Returns FOCUS_IN_EVENT event in *BUFP. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3228 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3229 static void |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3230 x_detect_focus_change (dpyinfo, event, bufp) |
|
46076
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3231 struct x_display_info *dpyinfo; |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3232 XEvent *event; |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3233 struct input_event *bufp; |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3234 { |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3235 struct frame *frame; |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3236 int nr_events = 0; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3237 |
|
50021
b5ec65424fcc
* xterm.c (x_detect_focus_change): Call x_any_window_to_frame
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49859
diff
changeset
|
3238 frame = x_any_window_to_frame (dpyinfo, event->xany.window); |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3239 if (! frame) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3240 return; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3241 |
|
46076
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3242 switch (event->type) |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3243 { |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3244 case EnterNotify: |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3245 case LeaveNotify: |
|
53061
4835b200fafe
* xterm.c (x_detect_focus_change): Do not change focus frame for
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53038
diff
changeset
|
3246 { |
|
4835b200fafe
* xterm.c (x_detect_focus_change): Do not change focus frame for
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53038
diff
changeset
|
3247 struct frame *focus_frame = dpyinfo->x_focus_event_frame; |
|
4835b200fafe
* xterm.c (x_detect_focus_change): Do not change focus frame for
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53038
diff
changeset
|
3248 int focus_state |
|
4835b200fafe
* xterm.c (x_detect_focus_change): Do not change focus frame for
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53038
diff
changeset
|
3249 = focus_frame ? focus_frame->output_data.x->focus_state : 0; |
|
4835b200fafe
* xterm.c (x_detect_focus_change): Do not change focus frame for
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53038
diff
changeset
|
3250 |
|
4835b200fafe
* xterm.c (x_detect_focus_change): Do not change focus frame for
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53038
diff
changeset
|
3251 if (event->xcrossing.detail != NotifyInferior |
|
4835b200fafe
* xterm.c (x_detect_focus_change): Do not change focus frame for
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53038
diff
changeset
|
3252 && event->xcrossing.focus |
|
4835b200fafe
* xterm.c (x_detect_focus_change): Do not change focus frame for
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53038
diff
changeset
|
3253 && ! (focus_state & FOCUS_EXPLICIT)) |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3254 x_focus_changed ((event->type == EnterNotify ? FocusIn : FocusOut), |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3255 FOCUS_IMPLICIT, |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3256 dpyinfo, frame, bufp); |
|
53061
4835b200fafe
* xterm.c (x_detect_focus_change): Do not change focus frame for
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53038
diff
changeset
|
3257 } |
|
46076
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3258 break; |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3259 |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3260 case FocusIn: |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3261 case FocusOut: |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3262 x_focus_changed (event->type, |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3263 (event->xfocus.detail == NotifyPointer ? |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3264 FOCUS_IMPLICIT : FOCUS_EXPLICIT), |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3265 dpyinfo, frame, bufp); |
|
46076
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3266 break; |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3267 } |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3268 } |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3269 |
|
819af351608b
(x_focus_changed): New function.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
45986
diff
changeset
|
3270 |
|
10223
97fc8c6b4a74
(XTupdate_begin): Discard records of prior mouse highlight
Richard M. Stallman <rms@gnu.org>
parents:
9823
diff
changeset
|
3271 /* Handle an event saying the mouse has moved out of an Emacs frame. */ |
|
97fc8c6b4a74
(XTupdate_begin): Discard records of prior mouse highlight
Richard M. Stallman <rms@gnu.org>
parents:
9823
diff
changeset
|
3272 |
|
97fc8c6b4a74
(XTupdate_begin): Discard records of prior mouse highlight
Richard M. Stallman <rms@gnu.org>
parents:
9823
diff
changeset
|
3273 void |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3274 x_mouse_leave (dpyinfo) |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3275 struct x_display_info *dpyinfo; |
|
10223
97fc8c6b4a74
(XTupdate_begin): Discard records of prior mouse highlight
Richard M. Stallman <rms@gnu.org>
parents:
9823
diff
changeset
|
3276 { |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3277 x_new_focus_frame (dpyinfo, dpyinfo->x_focus_event_frame); |
|
10223
97fc8c6b4a74
(XTupdate_begin): Discard records of prior mouse highlight
Richard M. Stallman <rms@gnu.org>
parents:
9823
diff
changeset
|
3278 } |
| 369 | 3279 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3280 /* The focus has changed, or we have redirected a frame's focus to |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3281 another frame (this happens when a frame uses a surrogate |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3282 mini-buffer frame). Shift the highlight as appropriate. |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3283 |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3284 The FRAME argument doesn't necessarily have anything to do with which |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3285 frame is being highlighted or un-highlighted; we only use it to find |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3286 the appropriate X display info. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3287 |
| 369 | 3288 static void |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3289 XTframe_rehighlight (frame) |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3290 struct frame *frame; |
| 369 | 3291 { |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3292 x_frame_rehighlight (FRAME_X_DISPLAY_INFO (frame)); |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3293 } |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3294 |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3295 static void |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3296 x_frame_rehighlight (dpyinfo) |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3297 struct x_display_info *dpyinfo; |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3298 { |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3299 struct frame *old_highlight = dpyinfo->x_highlight_frame; |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3300 |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3301 if (dpyinfo->x_focus_frame) |
| 286 | 3302 { |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3303 dpyinfo->x_highlight_frame |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3304 = ((GC_FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->x_focus_frame))) |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3305 ? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->x_focus_frame)) |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3306 : dpyinfo->x_focus_frame); |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3307 if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame)) |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3308 { |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3309 FRAME_FOCUS_FRAME (dpyinfo->x_focus_frame) = Qnil; |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3310 dpyinfo->x_highlight_frame = dpyinfo->x_focus_frame; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3311 } |
| 286 | 3312 } |
| 369 | 3313 else |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3314 dpyinfo->x_highlight_frame = 0; |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3315 |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3316 if (dpyinfo->x_highlight_frame != old_highlight) |
| 369 | 3317 { |
| 3318 if (old_highlight) | |
| 771 | 3319 frame_unhighlight (old_highlight); |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3320 if (dpyinfo->x_highlight_frame) |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
3321 frame_highlight (dpyinfo->x_highlight_frame); |
| 369 | 3322 } |
| 286 | 3323 } |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3324 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3325 |
| 286 | 3326 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3327 /* Keyboard processing - modifier keys, vendor-specific keysyms, etc. */ |
| 286 | 3328 |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3329 /* Initialize mode_switch_bit and modifier_meaning. */ |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3330 static void |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3331 x_find_modifier_meanings (dpyinfo) |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3332 struct x_display_info *dpyinfo; |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3333 { |
|
1324
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3334 int min_code, max_code; |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3335 KeySym *syms; |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3336 int syms_per_code; |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3337 XModifierKeymap *mods; |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3338 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3339 dpyinfo->meta_mod_mask = 0; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3340 dpyinfo->shift_lock_mask = 0; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3341 dpyinfo->alt_mod_mask = 0; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3342 dpyinfo->super_mod_mask = 0; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3343 dpyinfo->hyper_mod_mask = 0; |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
3344 |
|
2127
adaf588e32a6
* xterm.c (x_find_modifier_meanings): XDisplayKeycodes only
Jim Blandy <jimb@redhat.com>
parents:
2064
diff
changeset
|
3345 #ifdef HAVE_X11R4 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3346 XDisplayKeycodes (dpyinfo->display, &min_code, &max_code); |
|
2127
adaf588e32a6
* xterm.c (x_find_modifier_meanings): XDisplayKeycodes only
Jim Blandy <jimb@redhat.com>
parents:
2064
diff
changeset
|
3347 #else |
|
13884
26245345f6f1
(x_find_modifier_meanings): Fix !X11R4 code to use dpyinfo.
Richard M. Stallman <rms@gnu.org>
parents:
13782
diff
changeset
|
3348 min_code = dpyinfo->display->min_keycode; |
|
26245345f6f1
(x_find_modifier_meanings): Fix !X11R4 code to use dpyinfo.
Richard M. Stallman <rms@gnu.org>
parents:
13782
diff
changeset
|
3349 max_code = dpyinfo->display->max_keycode; |
|
2127
adaf588e32a6
* xterm.c (x_find_modifier_meanings): XDisplayKeycodes only
Jim Blandy <jimb@redhat.com>
parents:
2064
diff
changeset
|
3350 #endif |
|
adaf588e32a6
* xterm.c (x_find_modifier_meanings): XDisplayKeycodes only
Jim Blandy <jimb@redhat.com>
parents:
2064
diff
changeset
|
3351 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3352 syms = XGetKeyboardMapping (dpyinfo->display, |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3353 min_code, max_code - min_code + 1, |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3354 &syms_per_code); |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3355 mods = XGetModifierMapping (dpyinfo->display); |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3356 |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
3357 /* Scan the modifier table to see which modifier bits the Meta and |
|
1436
e7c5faab6571
* xterm.c (compose_status): New variable.
Jim Blandy <jimb@redhat.com>
parents:
1389
diff
changeset
|
3358 Alt keysyms are on. */ |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3359 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3360 int row, col; /* The row and column in the modifier table. */ |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3361 |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3362 for (row = 3; row < 8; row++) |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3363 for (col = 0; col < mods->max_keypermod; col++) |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3364 { |
|
10287
2e96f9f98276
(x_scroll_bar_handle_click): Use GC_WINDOWP.
Richard M. Stallman <rms@gnu.org>
parents:
10274
diff
changeset
|
3365 KeyCode code |
|
2e96f9f98276
(x_scroll_bar_handle_click): Use GC_WINDOWP.
Richard M. Stallman <rms@gnu.org>
parents:
10274
diff
changeset
|
3366 = mods->modifiermap[(row * mods->max_keypermod) + col]; |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3367 |
|
6560
a071babfa9ea
(x_find_modifier_meanings): Skip zero entries.
Karl Heuer <kwzh@gnu.org>
parents:
6521
diff
changeset
|
3368 /* Zeroes are used for filler. Skip them. */ |
|
a071babfa9ea
(x_find_modifier_meanings): Skip zero entries.
Karl Heuer <kwzh@gnu.org>
parents:
6521
diff
changeset
|
3369 if (code == 0) |
|
a071babfa9ea
(x_find_modifier_meanings): Skip zero entries.
Karl Heuer <kwzh@gnu.org>
parents:
6521
diff
changeset
|
3370 continue; |
|
a071babfa9ea
(x_find_modifier_meanings): Skip zero entries.
Karl Heuer <kwzh@gnu.org>
parents:
6521
diff
changeset
|
3371 |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3372 /* Are any of this keycode's keysyms a meta key? */ |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3373 { |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3374 int code_col; |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3375 |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3376 for (code_col = 0; code_col < syms_per_code; code_col++) |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3377 { |
|
1324
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3378 int sym = syms[((code - min_code) * syms_per_code) + code_col]; |
|
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3379 |
|
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3380 switch (sym) |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3381 { |
|
1324
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3382 case XK_Meta_L: |
|
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3383 case XK_Meta_R: |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3384 dpyinfo->meta_mod_mask |= (1 << row); |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3385 break; |
|
1324
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3386 |
|
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3387 case XK_Alt_L: |
|
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3388 case XK_Alt_R: |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3389 dpyinfo->alt_mod_mask |= (1 << row); |
|
2047
e179f9f55aa8
(x_alt_mod_mask, x_super_mod_mask, x_hyper_mod_mask): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
2016
diff
changeset
|
3390 break; |
|
e179f9f55aa8
(x_alt_mod_mask, x_super_mod_mask, x_hyper_mod_mask): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
2016
diff
changeset
|
3391 |
|
e179f9f55aa8
(x_alt_mod_mask, x_super_mod_mask, x_hyper_mod_mask): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
2016
diff
changeset
|
3392 case XK_Hyper_L: |
|
e179f9f55aa8
(x_alt_mod_mask, x_super_mod_mask, x_hyper_mod_mask): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
2016
diff
changeset
|
3393 case XK_Hyper_R: |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3394 dpyinfo->hyper_mod_mask |= (1 << row); |
|
2047
e179f9f55aa8
(x_alt_mod_mask, x_super_mod_mask, x_hyper_mod_mask): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
2016
diff
changeset
|
3395 break; |
|
e179f9f55aa8
(x_alt_mod_mask, x_super_mod_mask, x_hyper_mod_mask): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
2016
diff
changeset
|
3396 |
|
e179f9f55aa8
(x_alt_mod_mask, x_super_mod_mask, x_hyper_mod_mask): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
2016
diff
changeset
|
3397 case XK_Super_L: |
|
e179f9f55aa8
(x_alt_mod_mask, x_super_mod_mask, x_hyper_mod_mask): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
2016
diff
changeset
|
3398 case XK_Super_R: |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3399 dpyinfo->super_mod_mask |= (1 << row); |
|
1324
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3400 break; |
|
1436
e7c5faab6571
* xterm.c (compose_status): New variable.
Jim Blandy <jimb@redhat.com>
parents:
1389
diff
changeset
|
3401 |
|
e7c5faab6571
* xterm.c (compose_status): New variable.
Jim Blandy <jimb@redhat.com>
parents:
1389
diff
changeset
|
3402 case XK_Shift_Lock: |
|
e7c5faab6571
* xterm.c (compose_status): New variable.
Jim Blandy <jimb@redhat.com>
parents:
1389
diff
changeset
|
3403 /* Ignore this if it's not on the lock modifier. */ |
|
e7c5faab6571
* xterm.c (compose_status): New variable.
Jim Blandy <jimb@redhat.com>
parents:
1389
diff
changeset
|
3404 if ((1 << row) == LockMask) |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3405 dpyinfo->shift_lock_mask = LockMask; |
|
1436
e7c5faab6571
* xterm.c (compose_status): New variable.
Jim Blandy <jimb@redhat.com>
parents:
1389
diff
changeset
|
3406 break; |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3407 } |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3408 } |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3409 } |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3410 } |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3411 } |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3412 |
|
1324
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3413 /* If we couldn't find any meta keys, accept any alt keys as meta keys. */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3414 if (! dpyinfo->meta_mod_mask) |
|
2047
e179f9f55aa8
(x_alt_mod_mask, x_super_mod_mask, x_hyper_mod_mask): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
2016
diff
changeset
|
3415 { |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3416 dpyinfo->meta_mod_mask = dpyinfo->alt_mod_mask; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3417 dpyinfo->alt_mod_mask = 0; |
|
2047
e179f9f55aa8
(x_alt_mod_mask, x_super_mod_mask, x_hyper_mod_mask): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
2016
diff
changeset
|
3418 } |
|
1324
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3419 |
|
2923
c8997402dd6b
(x_find_modifier_meanings): If some keys are meta and alt,
Richard M. Stallman <rms@gnu.org>
parents:
2882
diff
changeset
|
3420 /* If some keys are both alt and meta, |
|
c8997402dd6b
(x_find_modifier_meanings): If some keys are meta and alt,
Richard M. Stallman <rms@gnu.org>
parents:
2882
diff
changeset
|
3421 make them just meta, not alt. */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3422 if (dpyinfo->alt_mod_mask & dpyinfo->meta_mod_mask) |
|
2923
c8997402dd6b
(x_find_modifier_meanings): If some keys are meta and alt,
Richard M. Stallman <rms@gnu.org>
parents:
2882
diff
changeset
|
3423 { |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3424 dpyinfo->alt_mod_mask &= ~dpyinfo->meta_mod_mask; |
|
2923
c8997402dd6b
(x_find_modifier_meanings): If some keys are meta and alt,
Richard M. Stallman <rms@gnu.org>
parents:
2882
diff
changeset
|
3425 } |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
3426 |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3427 XFree ((char *) syms); |
|
1324
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3428 XFreeModifiermap (mods); |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3429 } |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
3430 |
|
2661
77f1457d000e
Implement extra_keyboard_modifiers properly.
Jim Blandy <jimb@redhat.com>
parents:
2474
diff
changeset
|
3431 /* Convert between the modifier bits X uses and the modifier bits |
|
77f1457d000e
Implement extra_keyboard_modifiers properly.
Jim Blandy <jimb@redhat.com>
parents:
2474
diff
changeset
|
3432 Emacs uses. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3433 |
|
1530
a7f8a1fe258e
* xterm.c (x_convert_modifiers): Declare this to return an
Jim Blandy <jimb@redhat.com>
parents:
1436
diff
changeset
|
3434 static unsigned int |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3435 x_x_to_emacs_modifiers (dpyinfo, state) |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3436 struct x_display_info *dpyinfo; |
| 286 | 3437 unsigned int state; |
| 3438 { | |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3439 EMACS_UINT mod_meta = meta_modifier; |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3440 EMACS_UINT mod_alt = alt_modifier; |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3441 EMACS_UINT mod_hyper = hyper_modifier; |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3442 EMACS_UINT mod_super = super_modifier; |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3443 Lisp_Object tem; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3444 |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3445 tem = Fget (Vx_alt_keysym, Qmodifier_value); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3446 if (! EQ (tem, Qnil)) mod_alt = XUINT (tem); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3447 tem = Fget (Vx_meta_keysym, Qmodifier_value); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3448 if (! EQ (tem, Qnil)) mod_meta = XUINT (tem); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3449 tem = Fget (Vx_hyper_keysym, Qmodifier_value); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3450 if (! EQ (tem, Qnil)) mod_hyper = XUINT (tem); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3451 tem = Fget (Vx_super_keysym, Qmodifier_value); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3452 if (! EQ (tem, Qnil)) mod_super = XUINT (tem); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3453 |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3454 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3455 return ( ((state & (ShiftMask | dpyinfo->shift_lock_mask)) ? shift_modifier : 0) |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3456 | ((state & ControlMask) ? ctrl_modifier : 0) |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3457 | ((state & dpyinfo->meta_mod_mask) ? mod_meta : 0) |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3458 | ((state & dpyinfo->alt_mod_mask) ? mod_alt : 0) |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3459 | ((state & dpyinfo->super_mod_mask) ? mod_super : 0) |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3460 | ((state & dpyinfo->hyper_mod_mask) ? mod_hyper : 0)); |
| 286 | 3461 } |
| 3462 | |
|
2661
77f1457d000e
Implement extra_keyboard_modifiers properly.
Jim Blandy <jimb@redhat.com>
parents:
2474
diff
changeset
|
3463 static unsigned int |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3464 x_emacs_to_x_modifiers (dpyinfo, state) |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3465 struct x_display_info *dpyinfo; |
|
2661
77f1457d000e
Implement extra_keyboard_modifiers properly.
Jim Blandy <jimb@redhat.com>
parents:
2474
diff
changeset
|
3466 unsigned int state; |
|
77f1457d000e
Implement extra_keyboard_modifiers properly.
Jim Blandy <jimb@redhat.com>
parents:
2474
diff
changeset
|
3467 { |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3468 EMACS_UINT mod_meta = meta_modifier; |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3469 EMACS_UINT mod_alt = alt_modifier; |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3470 EMACS_UINT mod_hyper = hyper_modifier; |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3471 EMACS_UINT mod_super = super_modifier; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3472 |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3473 Lisp_Object tem; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3474 |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3475 tem = Fget (Vx_alt_keysym, Qmodifier_value); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3476 if (! EQ (tem, Qnil)) mod_alt = XUINT (tem); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3477 tem = Fget (Vx_meta_keysym, Qmodifier_value); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3478 if (! EQ (tem, Qnil)) mod_meta = XUINT (tem); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3479 tem = Fget (Vx_hyper_keysym, Qmodifier_value); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3480 if (! EQ (tem, Qnil)) mod_hyper = XUINT (tem); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3481 tem = Fget (Vx_super_keysym, Qmodifier_value); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3482 if (! EQ (tem, Qnil)) mod_super = XUINT (tem); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3483 |
|
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3484 |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3485 return ( ((state & mod_alt) ? dpyinfo->alt_mod_mask : 0) |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3486 | ((state & mod_super) ? dpyinfo->super_mod_mask : 0) |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3487 | ((state & mod_hyper) ? dpyinfo->hyper_mod_mask : 0) |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3488 | ((state & shift_modifier) ? ShiftMask : 0) |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3489 | ((state & ctrl_modifier) ? ControlMask : 0) |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
3490 | ((state & mod_meta) ? dpyinfo->meta_mod_mask : 0)); |
|
2661
77f1457d000e
Implement extra_keyboard_modifiers properly.
Jim Blandy <jimb@redhat.com>
parents:
2474
diff
changeset
|
3491 } |
|
12172
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3492 |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3493 /* Convert a keysym to its name. */ |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3494 |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3495 char * |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3496 x_get_keysym_name (keysym) |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3497 KeySym keysym; |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3498 { |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3499 char *value; |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3500 |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3501 BLOCK_INPUT; |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3502 value = XKeysymToString (keysym); |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3503 UNBLOCK_INPUT; |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3504 |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3505 return value; |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
3506 } |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3507 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3508 |
|
3585
19aab2d09a4d
* xterm.c (x_is_vendor_fkey): New function.
Jim Blandy <jimb@redhat.com>
parents:
3558
diff
changeset
|
3509 |
|
19aab2d09a4d
* xterm.c (x_is_vendor_fkey): New function.
Jim Blandy <jimb@redhat.com>
parents:
3558
diff
changeset
|
3510 /* Mouse clicks and mouse movement. Rah. */ |
|
19aab2d09a4d
* xterm.c (x_is_vendor_fkey): New function.
Jim Blandy <jimb@redhat.com>
parents:
3558
diff
changeset
|
3511 |
| 286 | 3512 /* Prepare a mouse-event in *RESULT for placement in the input queue. |
| 3513 | |
| 3514 If the event is a button press, then note that we have grabbed | |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3515 the mouse. */ |
| 286 | 3516 |
| 3517 static Lisp_Object | |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3518 construct_mouse_click (result, event, f) |
| 286 | 3519 struct input_event *result; |
| 3520 XButtonEvent *event; | |
| 771 | 3521 struct frame *f; |
| 286 | 3522 { |
|
45803
9484de301252
Rename enum event_kind items.
Pavel Jan?k <Pavel@Janik.cz>
parents:
45563
diff
changeset
|
3523 /* Make the event type NO_EVENT; we'll change that when we decide |
| 286 | 3524 otherwise. */ |
|
45803
9484de301252
Rename enum event_kind items.
Pavel Jan?k <Pavel@Janik.cz>
parents:
45563
diff
changeset
|
3525 result->kind = MOUSE_CLICK_EVENT; |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3526 result->code = event->button - Button1; |
| 708 | 3527 result->timestamp = event->time; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3528 result->modifiers = (x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3529 event->state) |
|
1324
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3530 | (event->type == ButtonRelease |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
3531 ? up_modifier |
|
1324
44215417cf6e
* xterm.c (x_find_modifier_meanings): If there are no
Jim Blandy <jimb@redhat.com>
parents:
1279
diff
changeset
|
3532 : down_modifier)); |
| 286 | 3533 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3534 XSETINT (result->x, event->x); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3535 XSETINT (result->y, event->y); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3536 XSETFRAME (result->frame_or_window, f); |
|
30197
3237a5529020
(construct_mouse_click, x_scroll_bar_to_input_event)
Gerd Moellmann <gerd@gnu.org>
parents:
30182
diff
changeset
|
3537 result->arg = Qnil; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3538 return Qnil; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3539 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3540 |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3541 |
| 429 | 3542 /* Function to report a mouse movement to the mainstream Emacs code. |
| 3543 The input handler calls this. | |
| 3544 | |
| 3545 We have received a mouse movement event, which is given in *event. | |
| 3546 If the mouse is over a different glyph than it was last time, tell | |
| 3547 the mainstream emacs code by setting mouse_moved. If not, ask for | |
| 3548 another motion event, so we can check again the next time it moves. */ | |
|
6616
951c8941b931
[INCLUDED_FCNTL]: Don't include fcntl.h again.
Richard M. Stallman <rms@gnu.org>
parents:
6560
diff
changeset
|
3549 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3550 static XMotionEvent last_mouse_motion_event; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3551 static Lisp_Object last_mouse_motion_frame; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3552 |
| 429 | 3553 static void |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3554 note_mouse_movement (frame, event) |
| 771 | 3555 FRAME_PTR frame; |
| 429 | 3556 XMotionEvent *event; |
| 3557 { | |
| 732 | 3558 last_mouse_movement_time = event->time; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3559 last_mouse_motion_event = *event; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3560 XSETFRAME (last_mouse_motion_frame, frame); |
| 732 | 3561 |
|
7680
8212755ff793
(note_mouse_movement): Use frame's window in XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
7651
diff
changeset
|
3562 if (event->window != FRAME_X_WINDOW (frame)) |
|
8212755ff793
(note_mouse_movement): Use frame's window in XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
7651
diff
changeset
|
3563 { |
|
12530
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
3564 frame->mouse_moved = 1; |
|
7680
8212755ff793
(note_mouse_movement): Use frame's window in XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
7651
diff
changeset
|
3565 last_mouse_scroll_bar = Qnil; |
|
8212755ff793
(note_mouse_movement): Use frame's window in XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
7651
diff
changeset
|
3566 note_mouse_highlight (frame, -1, -1); |
|
8212755ff793
(note_mouse_movement): Use frame's window in XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
7651
diff
changeset
|
3567 } |
|
8212755ff793
(note_mouse_movement): Use frame's window in XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
7651
diff
changeset
|
3568 |
| 429 | 3569 /* Has the mouse moved off the glyph it was on at the last sighting? */ |
|
7680
8212755ff793
(note_mouse_movement): Use frame's window in XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
7651
diff
changeset
|
3570 else if (event->x < last_mouse_glyph.x |
|
8212755ff793
(note_mouse_movement): Use frame's window in XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
7651
diff
changeset
|
3571 || event->x >= last_mouse_glyph.x + last_mouse_glyph.width |
|
8212755ff793
(note_mouse_movement): Use frame's window in XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
7651
diff
changeset
|
3572 || event->y < last_mouse_glyph.y |
|
8212755ff793
(note_mouse_movement): Use frame's window in XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
7651
diff
changeset
|
3573 || event->y >= last_mouse_glyph.y + last_mouse_glyph.height) |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3574 { |
|
12530
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
3575 frame->mouse_moved = 1; |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3576 last_mouse_scroll_bar = Qnil; |
|
6616
951c8941b931
[INCLUDED_FCNTL]: Don't include fcntl.h again.
Richard M. Stallman <rms@gnu.org>
parents:
6560
diff
changeset
|
3577 note_mouse_highlight (frame, event->x, event->y); |
| 429 | 3578 } |
| 3579 } | |
| 3580 | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3581 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3582 /************************************************************************ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3583 Mouse Face |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3584 ************************************************************************/ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3585 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3586 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3587 redo_mouse_highlight () |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3588 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3589 if (!NILP (last_mouse_motion_frame) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3590 && FRAME_LIVE_P (XFRAME (last_mouse_motion_frame))) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3591 note_mouse_highlight (XFRAME (last_mouse_motion_frame), |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3592 last_mouse_motion_event.x, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3593 last_mouse_motion_event.y); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3594 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3595 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3596 |
|
36492
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3597 static int glyph_rect P_ ((struct frame *f, int, int, XRectangle *)); |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3598 |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3599 |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3600 /* Try to determine frame pixel position and size of the glyph under |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3601 frame pixel coordinates X/Y on frame F . Return the position and |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3602 size in *RECT. Value is non-zero if we could compute these |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3603 values. */ |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3604 |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3605 static int |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3606 glyph_rect (f, x, y, rect) |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3607 struct frame *f; |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3608 int x, y; |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3609 XRectangle *rect; |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3610 { |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3611 Lisp_Object window; |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3612 struct window *w; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3613 struct glyph_row *r, *end_row; |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
3614 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
3615 window = window_from_coordinates (f, x, y, 0, &x, &y, 0); |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3616 if (NILP (window)) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3617 return 0; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3618 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3619 w = XWINDOW (window); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3620 r = MATRIX_FIRST_TEXT_ROW (w->current_matrix); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3621 end_row = r + w->current_matrix->nrows - 1; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3622 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3623 for (; r < end_row && r->enabled_p; ++r) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3624 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3625 if (r->y >= y) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3626 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3627 struct glyph *g = r->glyphs[TEXT_AREA]; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3628 struct glyph *end = g + r->used[TEXT_AREA]; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3629 int gx = r->x; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3630 while (g < end && gx < x) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3631 gx += g->pixel_width, ++g; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3632 if (g < end) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3633 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3634 rect->width = g->pixel_width; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3635 rect->height = r->height; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3636 rect->x = WINDOW_TO_FRAME_PIXEL_X (w, gx); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3637 rect->y = WINDOW_TO_FRAME_PIXEL_Y (w, r->y); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3638 return 1; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3639 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3640 break; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3641 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3642 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3643 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
3644 return 0; |
|
36492
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3645 } |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3646 |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3647 |
| 429 | 3648 /* Return the current position of the mouse. |
|
36492
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3649 *FP should be a frame which indicates which display to ask about. |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3650 |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3651 If the mouse movement started in a scroll bar, set *FP, *BAR_WINDOW, |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3652 and *PART to the frame, window, and scroll bar part that the mouse |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3653 is over. Set *X and *Y to the portion and whole of the mouse's |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3654 position on the scroll bar. |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3655 |
|
36492
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3656 If the mouse movement started elsewhere, set *FP to the frame the |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3657 mouse is on, *BAR_WINDOW to nil, and *X and *Y to the character cell |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3658 the mouse is over. |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3659 |
|
36492
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3660 Set *TIME to the server time-stamp for the time at which the mouse |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3661 was at this position. |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3662 |
|
3669
fd4187a96445
(XTmouse_position): Don't set *f at all unless we win.
Richard M. Stallman <rms@gnu.org>
parents:
3639
diff
changeset
|
3663 Don't store anything if we don't have a valid set of values to report. |
|
fd4187a96445
(XTmouse_position): Don't set *f at all unless we win.
Richard M. Stallman <rms@gnu.org>
parents:
3639
diff
changeset
|
3664 |
| 429 | 3665 This clears the mouse_moved flag, so we can wait for the next mouse |
|
15042
c99dd01d9334
(note_mouse_movement): Don't call XQueryPointer.
Richard M. Stallman <rms@gnu.org>
parents:
14963
diff
changeset
|
3666 movement. */ |
| 429 | 3667 |
| 3668 static void | |
|
11122
ce63fb361ae9
(XTmouse_position): New arg `insist'.
Richard M. Stallman <rms@gnu.org>
parents:
11015
diff
changeset
|
3669 XTmouse_position (fp, insist, bar_window, part, x, y, time) |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3670 FRAME_PTR *fp; |
|
11122
ce63fb361ae9
(XTmouse_position): New arg `insist'.
Richard M. Stallman <rms@gnu.org>
parents:
11015
diff
changeset
|
3671 int insist; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3672 Lisp_Object *bar_window; |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3673 enum scroll_bar_part *part; |
| 429 | 3674 Lisp_Object *x, *y; |
| 732 | 3675 unsigned long *time; |
| 429 | 3676 { |
|
3669
fd4187a96445
(XTmouse_position): Don't set *f at all unless we win.
Richard M. Stallman <rms@gnu.org>
parents:
3639
diff
changeset
|
3677 FRAME_PTR f1; |
|
fd4187a96445
(XTmouse_position): Don't set *f at all unless we win.
Richard M. Stallman <rms@gnu.org>
parents:
3639
diff
changeset
|
3678 |
| 429 | 3679 BLOCK_INPUT; |
| 3680 | |
|
20180
bfbf6a2939a3
(XTmouse_position): Handle INSIST < 0.
Karl Heuer <kwzh@gnu.org>
parents:
19447
diff
changeset
|
3681 if (! NILP (last_mouse_scroll_bar) && insist == 0) |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3682 x_scroll_bar_report_motion (fp, bar_window, part, x, y, time); |
| 429 | 3683 else |
| 3684 { | |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3685 Window root; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3686 int root_x, root_y; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3687 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3688 Window dummy_window; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3689 int dummy; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3690 |
|
12530
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
3691 Lisp_Object frame, tail; |
|
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
3692 |
|
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
3693 /* Clear the mouse-moved flag for every frame on this display. */ |
|
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
3694 FOR_EACH_FRAME (tail, frame) |
|
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
3695 if (FRAME_X_DISPLAY (XFRAME (frame)) == FRAME_X_DISPLAY (*fp)) |
|
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
3696 XFRAME (frame)->mouse_moved = 0; |
|
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
3697 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3698 last_mouse_scroll_bar = Qnil; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3699 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3700 /* Figure out which root window we're on. */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3701 XQueryPointer (FRAME_X_DISPLAY (*fp), |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3702 DefaultRootWindow (FRAME_X_DISPLAY (*fp)), |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3703 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3704 /* The root window which contains the pointer. */ |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3705 &root, |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3706 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3707 /* Trash which we can't trust if the pointer is on |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3708 a different screen. */ |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3709 &dummy_window, |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3710 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3711 /* The position on that root window. */ |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
3712 &root_x, &root_y, |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3713 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3714 /* More trash we can't trust. */ |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3715 &dummy, &dummy, |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3716 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3717 /* Modifier keys and pointer buttons, about which |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3718 we don't care. */ |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3719 (unsigned int *) &dummy); |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3720 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3721 /* Now we have a position on the root; find the innermost window |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3722 containing the pointer. */ |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3723 { |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3724 Window win, child; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3725 int win_x, win_y; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3726 int parent_x = 0, parent_y = 0; |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
3727 int count; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3728 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3729 win = root; |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3730 |
|
11436
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
3731 /* XTranslateCoordinates can get errors if the window |
|
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
3732 structure is changing at the same time this function |
|
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
3733 is running. So at least we must not crash from them. */ |
|
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
3734 |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
3735 count = x_catch_errors (FRAME_X_DISPLAY (*fp)); |
|
11436
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
3736 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3737 if (FRAME_X_DISPLAY_INFO (*fp)->grabbed && last_mouse_frame |
|
8430
356e5509efda
(construct_mouse_click, construct_menu_click):
Richard M. Stallman <rms@gnu.org>
parents:
8353
diff
changeset
|
3738 && FRAME_LIVE_P (last_mouse_frame)) |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3739 { |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3740 /* If mouse was grabbed on a frame, give coords for that frame |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3741 even if the mouse is now outside it. */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3742 XTranslateCoordinates (FRAME_X_DISPLAY (*fp), |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3743 |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3744 /* From-window, to-window. */ |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3745 root, FRAME_X_WINDOW (last_mouse_frame), |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3746 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3747 /* From-position, to-position. */ |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3748 root_x, root_y, &win_x, &win_y, |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3749 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3750 /* Child of win. */ |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3751 &child); |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3752 f1 = last_mouse_frame; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3753 } |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3754 else |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3755 { |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3756 while (1) |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3757 { |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3758 XTranslateCoordinates (FRAME_X_DISPLAY (*fp), |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3759 |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3760 /* From-window, to-window. */ |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3761 root, win, |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3762 |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3763 /* From-position, to-position. */ |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3764 root_x, root_y, &win_x, &win_y, |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3765 |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3766 /* Child of win. */ |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3767 &child); |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3768 |
|
13627
8873aa3451dd
(XTmouse_position): Exit the loop if child == win.
Richard M. Stallman <rms@gnu.org>
parents:
13598
diff
changeset
|
3769 if (child == None || child == win) |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3770 break; |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3771 |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3772 win = child; |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3773 parent_x = win_x; |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3774 parent_y = win_y; |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3775 } |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3776 |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3777 /* Now we know that: |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3778 win is the innermost window containing the pointer |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3779 (XTC says it has no child containing the pointer), |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3780 win_x and win_y are the pointer's position in it |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3781 (XTC did this the last time through), and |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3782 parent_x and parent_y are the pointer's position in win's parent. |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3783 (They are what win_x and win_y were when win was child. |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3784 If win is the root window, it has no parent, and |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3785 parent_{x,y} are invalid, but that's okay, because we'll |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3786 never use them in that case.) */ |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3787 |
|
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3788 /* Is win one of our frames? */ |
|
11198
571306c7b038
New arg DPYINFO to all callers of x_window_to_frame, x_any_window_to_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11166
diff
changeset
|
3789 f1 = x_any_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win); |
|
34008
8702e88a1669
(XTmouse_position) [USE_X_TOOLKIT]: When the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
33958
diff
changeset
|
3790 |
|
8702e88a1669
(XTmouse_position) [USE_X_TOOLKIT]: When the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
33958
diff
changeset
|
3791 #ifdef USE_X_TOOLKIT |
|
8702e88a1669
(XTmouse_position) [USE_X_TOOLKIT]: When the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
33958
diff
changeset
|
3792 /* If we end up with the menu bar window, say it's not |
|
8702e88a1669
(XTmouse_position) [USE_X_TOOLKIT]: When the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
33958
diff
changeset
|
3793 on the frame. */ |
|
8702e88a1669
(XTmouse_position) [USE_X_TOOLKIT]: When the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
33958
diff
changeset
|
3794 if (f1 != NULL |
|
8702e88a1669
(XTmouse_position) [USE_X_TOOLKIT]: When the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
33958
diff
changeset
|
3795 && f1->output_data.x->menubar_widget |
|
8702e88a1669
(XTmouse_position) [USE_X_TOOLKIT]: When the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
33958
diff
changeset
|
3796 && win == XtWindow (f1->output_data.x->menubar_widget)) |
|
8702e88a1669
(XTmouse_position) [USE_X_TOOLKIT]: When the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
33958
diff
changeset
|
3797 f1 = NULL; |
|
8702e88a1669
(XTmouse_position) [USE_X_TOOLKIT]: When the mouse
Gerd Moellmann <gerd@gnu.org>
parents:
33958
diff
changeset
|
3798 #endif /* USE_X_TOOLKIT */ |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
3799 } |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
3800 |
|
11436
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
3801 if (x_had_errors_p (FRAME_X_DISPLAY (*fp))) |
|
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
3802 f1 = 0; |
|
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
3803 |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
3804 x_uncatch_errors (FRAME_X_DISPLAY (*fp), count); |
|
11436
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
3805 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3806 /* If not, is it one of our scroll bars? */ |
|
3669
fd4187a96445
(XTmouse_position): Don't set *f at all unless we win.
Richard M. Stallman <rms@gnu.org>
parents:
3639
diff
changeset
|
3807 if (! f1) |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3808 { |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
3809 struct scroll_bar *bar; |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
3810 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
3811 bar = x_window_to_scroll_bar (FRAME_X_DISPLAY (*fp), win); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3812 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3813 if (bar) |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3814 { |
|
3669
fd4187a96445
(XTmouse_position): Don't set *f at all unless we win.
Richard M. Stallman <rms@gnu.org>
parents:
3639
diff
changeset
|
3815 f1 = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3816 win_x = parent_x; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3817 win_y = parent_y; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3818 } |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3819 } |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3820 |
|
20180
bfbf6a2939a3
(XTmouse_position): Handle INSIST < 0.
Karl Heuer <kwzh@gnu.org>
parents:
19447
diff
changeset
|
3821 if (f1 == 0 && insist > 0) |
|
25682
f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
25646
diff
changeset
|
3822 f1 = SELECTED_FRAME (); |
|
11122
ce63fb361ae9
(XTmouse_position): New arg `insist'.
Richard M. Stallman <rms@gnu.org>
parents:
11015
diff
changeset
|
3823 |
|
3669
fd4187a96445
(XTmouse_position): Don't set *f at all unless we win.
Richard M. Stallman <rms@gnu.org>
parents:
3639
diff
changeset
|
3824 if (f1) |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3825 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3826 /* Ok, we found a frame. Store all the values. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3827 last_mouse_glyph is a rectangle used to reduce the |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3828 generation of mouse events. To not miss any motion |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3829 events, we must divide the frame into rectangles of the |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3830 size of the smallest character that could be displayed |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3831 on it, i.e. into the same rectangles that matrices on |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3832 the frame are divided into. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3833 |
|
36492
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3834 int width, height, gx, gy; |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3835 XRectangle rect; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3836 |
|
36492
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3837 if (glyph_rect (f1, win_x, win_y, &rect)) |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3838 last_mouse_glyph = rect; |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3839 else |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3840 { |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3841 width = FRAME_SMALLEST_CHAR_WIDTH (f1); |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3842 height = FRAME_SMALLEST_FONT_HEIGHT (f1); |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3843 gx = win_x; |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3844 gy = win_y; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3845 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
3846 /* Arrange for the division in FRAME_PIXEL_X_TO_COL etc. to |
|
36492
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3847 round down even for negative values. */ |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3848 if (gx < 0) |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3849 gx -= width - 1; |
| 36555 | 3850 if (gy < 0) |
|
36492
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3851 gy -= height - 1; |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3852 gx = (gx + width - 1) / width * width; |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3853 gy = (gy + height - 1) / height * height; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3854 |
|
36492
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3855 last_mouse_glyph.width = width; |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3856 last_mouse_glyph.height = height; |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3857 last_mouse_glyph.x = gx; |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3858 last_mouse_glyph.y = gy; |
|
da77079d6981
(glyph_rect): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
36475
diff
changeset
|
3859 } |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3860 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3861 *bar_window = Qnil; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3862 *part = 0; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
3863 *fp = f1; |
|
9338
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
3864 XSETINT (*x, win_x); |
|
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
3865 XSETINT (*y, win_y); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3866 *time = last_mouse_movement_time; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3867 } |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
3868 } |
| 429 | 3869 } |
| 3870 | |
| 3871 UNBLOCK_INPUT; | |
| 3872 } | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3873 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3874 |
| 429 | 3875 |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
3876 /*********************************************************************** |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
3877 Scroll bars |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
3878 ***********************************************************************/ |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
3879 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3880 /* Scroll bar support. */ |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3881 |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
3882 /* Given an X window ID and a DISPLAY, find the struct scroll_bar which |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
3883 manages it. |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3884 This can be called in GC, so we have to make sure to strip off mark |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3885 bits. */ |
|
27428
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
3886 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3887 static struct scroll_bar * |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
3888 x_window_to_scroll_bar (display, window_id) |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
3889 Display *display; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3890 Window window_id; |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3891 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3892 Lisp_Object tail; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3893 |
|
50064
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
3894 #ifdef USE_GTK |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
3895 window_id = (Window) xg_get_scroll_id_for_window (display, window_id); |
|
50064
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
3896 #endif /* USE_GTK */ |
|
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
3897 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3898 for (tail = Vframe_list; |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3899 XGCTYPE (tail) == Lisp_Cons; |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
3900 tail = XCDR (tail)) |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3901 { |
|
6521
a975c5944916
(x_window_to_scroll_bar, x_new_font): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6413
diff
changeset
|
3902 Lisp_Object frame, bar, condemned; |
|
a975c5944916
(x_window_to_scroll_bar, x_new_font): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6413
diff
changeset
|
3903 |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
3904 frame = XCAR (tail); |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3905 /* All elements of Vframe_list should be frames. */ |
|
10287
2e96f9f98276
(x_scroll_bar_handle_click): Use GC_WINDOWP.
Richard M. Stallman <rms@gnu.org>
parents:
10274
diff
changeset
|
3906 if (! GC_FRAMEP (frame)) |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3907 abort (); |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3908 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3909 /* Scan this frame's scroll bar list for a scroll bar with the |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3910 right window ID. */ |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3911 condemned = FRAME_CONDEMNED_SCROLL_BARS (XFRAME (frame)); |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3912 for (bar = FRAME_SCROLL_BARS (XFRAME (frame)); |
|
1803
5752a95053f2
* xterm.c (x_window_to_scrollbar): Search frames'
Jim Blandy <jimb@redhat.com>
parents:
1793
diff
changeset
|
3913 /* This trick allows us to search both the ordinary and |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3914 condemned scroll bar lists with one loop. */ |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3915 ! GC_NILP (bar) || (bar = condemned, |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3916 condemned = Qnil, |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3917 ! GC_NILP (bar)); |
|
5825
b1f35db748d8
(x_make_frame_invisible): Add USE_X_TOOLKIT conditional.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5753
diff
changeset
|
3918 bar = XSCROLL_BAR (bar)->next) |
|
53083
bf86de5f6d07
* xterm.c (x_window_to_scroll_bar): Move check of display to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53069
diff
changeset
|
3919 if (SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar)) == window_id && |
|
bf86de5f6d07
* xterm.c (x_window_to_scroll_bar): Move check of display to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53069
diff
changeset
|
3920 FRAME_X_DISPLAY (XFRAME (frame)) == display) |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
3921 return XSCROLL_BAR (bar); |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3922 } |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3923 |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3924 return 0; |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3925 } |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
3926 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3927 |
|
39671
45d46b88cdd1
USE_LUCID can be defined iff USE_X_TOOLKIT is defined.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39618
diff
changeset
|
3928 #if defined USE_LUCID |
|
37525
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3929 |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3930 /* Return the Lucid menu bar WINDOW is part of. Return null |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3931 if WINDOW is not part of a menu bar. */ |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3932 |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3933 static Widget |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3934 x_window_to_menu_bar (window) |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3935 Window window; |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3936 { |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3937 Lisp_Object tail; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3938 |
|
37525
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3939 for (tail = Vframe_list; |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3940 XGCTYPE (tail) == Lisp_Cons; |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3941 tail = XCDR (tail)) |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3942 { |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3943 Lisp_Object frame = XCAR (tail); |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3944 Widget menu_bar = XFRAME (frame)->output_data.x->menubar_widget; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
3945 |
|
37525
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3946 if (menu_bar && xlwmenu_window_p (menu_bar, window)) |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3947 return menu_bar; |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3948 } |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3949 |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3950 return NULL; |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3951 } |
|
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3952 |
|
39671
45d46b88cdd1
USE_LUCID can be defined iff USE_X_TOOLKIT is defined.
Pavel Jan?k <Pavel@Janik.cz>
parents:
39618
diff
changeset
|
3953 #endif /* USE_LUCID */ |
|
37525
3ae3b09f76a1
(x_window_to_menu_bar) [USE_LUCID]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37212
diff
changeset
|
3954 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3955 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3956 /************************************************************************ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3957 Toolkit scroll bars |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3958 ************************************************************************/ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3959 |
|
34066
2482c17f546e
Test USE_TOOLKIT_SCROLL_BARS everywhere with #ifdef and
Gerd Moellmann <gerd@gnu.org>
parents:
34030
diff
changeset
|
3960 #ifdef USE_TOOLKIT_SCROLL_BARS |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3961 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3962 static void x_scroll_bar_to_input_event P_ ((XEvent *, struct input_event *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3963 static void x_send_scroll_bar_event P_ ((Lisp_Object, int, int, int)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3964 static void x_create_toolkit_scroll_bar P_ ((struct frame *, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3965 struct scroll_bar *)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3966 static void x_set_toolkit_scroll_bar_thumb P_ ((struct scroll_bar *, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3967 int, int, int)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3968 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3969 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3970 /* Lisp window being scrolled. Set when starting to interact with |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3971 a toolkit scroll bar, reset to nil when ending the interaction. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3972 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3973 static Lisp_Object window_being_scrolled; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3974 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3975 /* Last scroll bar part sent in xm_scroll_callback. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3976 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3977 static int last_scroll_bar_part; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3978 |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
3979 /* Whether this is an Xaw with arrow-scrollbars. This should imply |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
3980 that movements of 1/20 of the screen size are mapped to up/down. */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
3981 |
| 49322 | 3982 #ifndef USE_GTK |
| 3983 /* Id of action hook installed for scroll bars. */ | |
| 3984 | |
| 3985 static XtActionHookId action_hook_id; | |
| 3986 | |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
3987 static Boolean xaw3d_arrow_scroll; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
3988 |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
3989 /* Whether the drag scrolling maintains the mouse at the top of the |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
3990 thumb. If not, resizing the thumb needs to be done more carefully |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
3991 to avoid jerkyness. */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
3992 |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
3993 static Boolean xaw3d_pick_top; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
3994 |
|
50324
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
3995 extern void set_vertical_scroll_bar P_ ((struct window *)); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3996 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3997 /* Action hook installed via XtAppAddActionHook when toolkit scroll |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
3998 bars are used.. The hook is responsible for detecting when |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
3999 the user ends an interaction with the scroll bar, and generates |
|
45803
9484de301252
Rename enum event_kind items.
Pavel Jan?k <Pavel@Janik.cz>
parents:
45563
diff
changeset
|
4000 a `end-scroll' SCROLL_BAR_CLICK_EVENT' event if so. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4001 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4002 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4003 xt_action_hook (widget, client_data, action_name, event, params, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4004 num_params) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4005 Widget widget; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4006 XtPointer client_data; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4007 String action_name; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4008 XEvent *event; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4009 String *params; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4010 Cardinal *num_params; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4011 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4012 int scroll_bar_p; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4013 char *end_action; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4014 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4015 #ifdef USE_MOTIF |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4016 scroll_bar_p = XmIsScrollBar (widget); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4017 end_action = "Release"; |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4018 #else /* !USE_MOTIF i.e. use Xaw */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4019 scroll_bar_p = XtIsSubclass (widget, scrollbarWidgetClass); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4020 end_action = "EndScroll"; |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4021 #endif /* USE_MOTIF */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4022 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4023 if (scroll_bar_p |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4024 && strcmp (action_name, end_action) == 0 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4025 && WINDOWP (window_being_scrolled)) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4026 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4027 struct window *w; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4028 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4029 x_send_scroll_bar_event (window_being_scrolled, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4030 scroll_bar_end_scroll, 0, 0); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4031 w = XWINDOW (window_being_scrolled); |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
4032 |
|
50324
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
4033 if (!NILP (XSCROLL_BAR (w->vertical_scroll_bar)->dragging)) |
|
50327
f139cd7e1d62
(xt_action_hook): Unset dragging so the reset does take place.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50326
diff
changeset
|
4034 { |
|
f139cd7e1d62
(xt_action_hook): Unset dragging so the reset does take place.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50326
diff
changeset
|
4035 XSCROLL_BAR (w->vertical_scroll_bar)->dragging = Qnil; |
|
f139cd7e1d62
(xt_action_hook): Unset dragging so the reset does take place.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50326
diff
changeset
|
4036 /* The thumb size is incorrect while dragging: fix it. */ |
|
f139cd7e1d62
(xt_action_hook): Unset dragging so the reset does take place.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50326
diff
changeset
|
4037 set_vertical_scroll_bar (w); |
|
f139cd7e1d62
(xt_action_hook): Unset dragging so the reset does take place.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50326
diff
changeset
|
4038 } |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4039 window_being_scrolled = Qnil; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4040 last_scroll_bar_part = -1; |
|
27428
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
4041 |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
4042 /* Xt timeouts no longer needed. */ |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
4043 toolkit_scroll_bar_interaction = 0; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4044 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4045 } |
| 49322 | 4046 #endif /* not USE_GTK */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4047 |
|
33643
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4048 /* A vector of windows used for communication between |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4049 x_send_scroll_bar_event and x_scroll_bar_to_input_event. */ |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4050 |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4051 static struct window **scroll_bar_windows; |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4052 static int scroll_bar_windows_size; |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4053 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4054 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4055 /* Send a client message with message type Xatom_Scrollbar for a |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4056 scroll action to the frame of WINDOW. PART is a value identifying |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4057 the part of the scroll bar that was clicked on. PORTION is the |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4058 amount to scroll of a whole of WHOLE. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4059 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4060 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4061 x_send_scroll_bar_event (window, part, portion, whole) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4062 Lisp_Object window; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4063 int part, portion, whole; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4064 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4065 XEvent event; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4066 XClientMessageEvent *ev = (XClientMessageEvent *) &event; |
|
33643
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4067 struct window *w = XWINDOW (window); |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4068 struct frame *f = XFRAME (w->frame); |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4069 int i; |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4070 |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4071 BLOCK_INPUT; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4072 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4073 /* Construct a ClientMessage event to send to the frame. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4074 ev->type = ClientMessage; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4075 ev->message_type = FRAME_X_DISPLAY_INFO (f)->Xatom_Scrollbar; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4076 ev->display = FRAME_X_DISPLAY (f); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4077 ev->window = FRAME_X_WINDOW (f); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4078 ev->format = 32; |
|
33643
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4079 |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4080 /* We can only transfer 32 bits in the XClientMessageEvent, which is |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4081 not enough to store a pointer or Lisp_Object on a 64 bit system. |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4082 So, store the window in scroll_bar_windows and pass the index |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4083 into that array in the event. */ |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4084 for (i = 0; i < scroll_bar_windows_size; ++i) |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4085 if (scroll_bar_windows[i] == NULL) |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4086 break; |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4087 |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4088 if (i == scroll_bar_windows_size) |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4089 { |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4090 int new_size = max (10, 2 * scroll_bar_windows_size); |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4091 size_t nbytes = new_size * sizeof *scroll_bar_windows; |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4092 size_t old_nbytes = scroll_bar_windows_size * sizeof *scroll_bar_windows; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4093 |
|
33643
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4094 scroll_bar_windows = (struct window **) xrealloc (scroll_bar_windows, |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4095 nbytes); |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4096 bzero (&scroll_bar_windows[i], nbytes - old_nbytes); |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4097 scroll_bar_windows_size = new_size; |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4098 } |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4099 |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4100 scroll_bar_windows[i] = w; |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4101 ev->data.l[0] = (long) i; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4102 ev->data.l[1] = (long) part; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4103 ev->data.l[2] = (long) 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4104 ev->data.l[3] = (long) portion; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4105 ev->data.l[4] = (long) whole; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4106 |
|
27428
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
4107 /* Make Xt timeouts work while the scroll bar is active. */ |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
4108 toolkit_scroll_bar_interaction = 1; |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
4109 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4110 /* Setting the event mask to zero means that the message will |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4111 be sent to the client that created the window, and if that |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4112 window no longer exists, no event will be sent. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4113 XSendEvent (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), False, 0, &event); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4114 UNBLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4115 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4116 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4117 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4118 /* Transform a scroll bar ClientMessage EVENT to an Emacs input event |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4119 in *IEVENT. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4120 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4121 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4122 x_scroll_bar_to_input_event (event, ievent) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4123 XEvent *event; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4124 struct input_event *ievent; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4125 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4126 XClientMessageEvent *ev = (XClientMessageEvent *) event; |
|
29717
acaa36b47f50
fix up more Lisp_Object/int conversion issues
Ken Raeburn <raeburn@raeburn.org>
parents:
29619
diff
changeset
|
4127 Lisp_Object window; |
|
acaa36b47f50
fix up more Lisp_Object/int conversion issues
Ken Raeburn <raeburn@raeburn.org>
parents:
29619
diff
changeset
|
4128 struct frame *f; |
|
33643
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4129 struct window *w; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4130 |
|
33643
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4131 w = scroll_bar_windows[ev->data.l[0]]; |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4132 scroll_bar_windows[ev->data.l[0]] = NULL; |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4133 |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4134 XSETWINDOW (window, w); |
|
5c2be00ed2ba
(scroll_bar_windows, scroll_bar_windows_size): New
Gerd Moellmann <gerd@gnu.org>
parents:
33606
diff
changeset
|
4135 f = XFRAME (w->frame); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4136 |
|
45803
9484de301252
Rename enum event_kind items.
Pavel Jan?k <Pavel@Janik.cz>
parents:
45563
diff
changeset
|
4137 ievent->kind = SCROLL_BAR_CLICK_EVENT; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4138 ievent->frame_or_window = window; |
|
30197
3237a5529020
(construct_mouse_click, x_scroll_bar_to_input_event)
Gerd Moellmann <gerd@gnu.org>
parents:
30182
diff
changeset
|
4139 ievent->arg = Qnil; |
| 49322 | 4140 #ifdef USE_GTK |
| 4141 ievent->timestamp = CurrentTime; | |
| 4142 #else | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4143 ievent->timestamp = XtLastTimestampProcessed (FRAME_X_DISPLAY (f)); |
| 49322 | 4144 #endif |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4145 ievent->part = ev->data.l[1]; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4146 ievent->code = ev->data.l[2]; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4147 ievent->x = make_number ((int) ev->data.l[3]); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4148 ievent->y = make_number ((int) ev->data.l[4]); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4149 ievent->modifiers = 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4150 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4151 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4152 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4153 #ifdef USE_MOTIF |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4154 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4155 /* Minimum and maximum values used for Motif scroll bars. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4156 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4157 #define XM_SB_MAX 10000000 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4158 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4159 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4160 /* Scroll bar callback for Motif scroll bars. WIDGET is the scroll |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4161 bar widget. CLIENT_DATA is a pointer to the scroll_bar structure. |
| 46159 | 4162 CALL_DATA is a pointer to a XmScrollBarCallbackStruct. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4163 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4164 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4165 xm_scroll_callback (widget, client_data, call_data) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4166 Widget widget; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4167 XtPointer client_data, call_data; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4168 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4169 struct scroll_bar *bar = (struct scroll_bar *) client_data; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4170 XmScrollBarCallbackStruct *cs = (XmScrollBarCallbackStruct *) call_data; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4171 int part = -1, whole = 0, portion = 0; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4172 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4173 switch (cs->reason) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4174 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4175 case XmCR_DECREMENT: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4176 bar->dragging = Qnil; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4177 part = scroll_bar_up_arrow; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4178 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4179 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4180 case XmCR_INCREMENT: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4181 bar->dragging = Qnil; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4182 part = scroll_bar_down_arrow; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4183 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4184 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4185 case XmCR_PAGE_DECREMENT: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4186 bar->dragging = Qnil; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4187 part = scroll_bar_above_handle; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4188 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4189 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4190 case XmCR_PAGE_INCREMENT: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4191 bar->dragging = Qnil; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4192 part = scroll_bar_below_handle; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4193 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4194 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4195 case XmCR_TO_TOP: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4196 bar->dragging = Qnil; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4197 part = scroll_bar_to_top; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4198 break; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4199 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4200 case XmCR_TO_BOTTOM: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4201 bar->dragging = Qnil; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4202 part = scroll_bar_to_bottom; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4203 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4204 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4205 case XmCR_DRAG: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4206 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4207 int slider_size; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4208 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4209 /* Get the slider size. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4210 BLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4211 XtVaGetValues (widget, XmNsliderSize, &slider_size, NULL); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4212 UNBLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4213 |
|
50326
d63b3eeca844
(xm_scroll_callback): Undo a tiny bit of the previous change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50324
diff
changeset
|
4214 whole = XM_SB_MAX - slider_size; |
|
50324
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
4215 portion = min (cs->value, whole); |
|
43884
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4216 part = scroll_bar_handle; |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4217 bar->dragging = make_number (cs->value); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4218 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4219 break; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4220 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4221 case XmCR_VALUE_CHANGED: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4222 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4223 }; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4224 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4225 if (part >= 0) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4226 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4227 window_being_scrolled = bar->window; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4228 last_scroll_bar_part = part; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4229 x_send_scroll_bar_event (bar->window, part, portion, whole); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4230 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4231 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4232 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4233 |
| 49322 | 4234 #else /* !USE_MOTIF, i.e. Xaw or GTK */ |
| 4235 #ifdef USE_GTK | |
|
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50151
diff
changeset
|
4236 /* Scroll bar callback for GTK scroll bars. WIDGET is the scroll |
|
50521
3b4cda88d7ef
* xterm.c (xg_scroll_callback): Call gtk_range_get_adjustment to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50371
diff
changeset
|
4237 bar widget. DATA is a pointer to the scroll_bar structure. */ |
| 49322 | 4238 |
| 4239 static void | |
| 4240 xg_scroll_callback (widget, data) | |
|
50521
3b4cda88d7ef
* xterm.c (xg_scroll_callback): Call gtk_range_get_adjustment to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50371
diff
changeset
|
4241 GtkRange *widget; |
| 49322 | 4242 gpointer data; |
| 4243 { | |
| 4244 struct scroll_bar *bar = (struct scroll_bar *) data; | |
| 4245 gdouble previous; | |
| 4246 gdouble position; | |
| 4247 gdouble *p; | |
| 4248 int diff; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
4249 |
| 49322 | 4250 int part = -1, whole = 0, portion = 0; |
|
50521
3b4cda88d7ef
* xterm.c (xg_scroll_callback): Call gtk_range_get_adjustment to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50371
diff
changeset
|
4251 GtkAdjustment *adj = GTK_ADJUSTMENT (gtk_range_get_adjustment (widget)); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
4252 |
| 49322 | 4253 if (xg_ignore_gtk_scrollbar) return; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
4254 |
| 49322 | 4255 position = gtk_adjustment_get_value (adj); |
| 4256 | |
| 4257 p = g_object_get_data (G_OBJECT (widget), XG_LAST_SB_DATA); | |
| 4258 if (! p) | |
| 4259 { | |
| 4260 p = (gdouble*) xmalloc (sizeof (gdouble)); | |
| 4261 *p = XG_SB_MIN; | |
| 4262 g_object_set_data (G_OBJECT (widget), XG_LAST_SB_DATA, p); | |
| 4263 } | |
| 4264 | |
| 4265 previous = *p; | |
| 4266 *p = position; | |
| 4267 | |
| 4268 diff = (int) (position - previous); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
4269 |
| 49322 | 4270 if (diff == (int) adj->step_increment) |
| 4271 { | |
| 4272 part = scroll_bar_down_arrow; | |
| 4273 bar->dragging = Qnil; | |
| 4274 } | |
| 4275 else if (-diff == (int) adj->step_increment) | |
| 4276 { | |
| 4277 part = scroll_bar_up_arrow; | |
| 4278 bar->dragging = Qnil; | |
| 4279 } | |
| 4280 else if (diff == (int) adj->page_increment) | |
| 4281 { | |
| 4282 part = scroll_bar_below_handle; | |
| 4283 bar->dragging = Qnil; | |
| 4284 } | |
| 4285 else if (-diff == (int) adj->page_increment) | |
| 4286 { | |
| 4287 part = scroll_bar_above_handle; | |
| 4288 bar->dragging = Qnil; | |
| 4289 } | |
| 4290 else | |
| 4291 { | |
| 4292 part = scroll_bar_handle; | |
| 4293 whole = adj->upper - adj->page_size; | |
|
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50151
diff
changeset
|
4294 portion = min ((int)position, whole); |
|
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50151
diff
changeset
|
4295 bar->dragging = make_number ((int)portion); |
| 49322 | 4296 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
4297 |
| 49322 | 4298 if (part >= 0) |
| 4299 { | |
| 4300 window_being_scrolled = bar->window; | |
| 4301 last_scroll_bar_part = part; | |
| 4302 x_send_scroll_bar_event (bar->window, part, portion, whole); | |
| 4303 } | |
| 4304 } | |
| 4305 | |
| 4306 #else /* not USE_GTK */ | |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4307 |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4308 /* Xaw scroll bar callback. Invoked when the thumb is dragged. |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4309 WIDGET is the scroll bar widget. CLIENT_DATA is a pointer to the |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4310 scroll bar struct. CALL_DATA is a pointer to a float saying where |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4311 the thumb is. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4312 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4313 static void |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4314 xaw_jump_callback (widget, client_data, call_data) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4315 Widget widget; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4316 XtPointer client_data, call_data; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4317 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4318 struct scroll_bar *bar = (struct scroll_bar *) client_data; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4319 float top = *(float *) call_data; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4320 float shown; |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4321 int whole, portion, height; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4322 int part; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4323 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4324 /* Get the size of the thumb, a value between 0 and 1. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4325 BLOCK_INPUT; |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4326 XtVaGetValues (widget, XtNshown, &shown, XtNheight, &height, NULL); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4327 UNBLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4328 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4329 whole = 10000000; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4330 portion = shown < 1 ? top * whole : 0; |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4331 |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4332 if (shown < 1 && (abs (top + shown - 1) < 1.0/height)) |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4333 /* Some derivatives of Xaw refuse to shrink the thumb when you reach |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4334 the bottom, so we force the scrolling whenever we see that we're |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4335 too close to the bottom (in x_set_toolkit_scroll_bar_thumb |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4336 we try to ensure that we always stay two pixels away from the |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4337 bottom). */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4338 part = scroll_bar_down_arrow; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4339 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4340 part = scroll_bar_handle; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4341 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4342 window_being_scrolled = bar->window; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4343 bar->dragging = make_number (portion); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4344 last_scroll_bar_part = part; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4345 x_send_scroll_bar_event (bar->window, part, portion, whole); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4346 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4347 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4348 |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4349 /* Xaw scroll bar callback. Invoked for incremental scrolling., |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4350 i.e. line or page up or down. WIDGET is the Xaw scroll bar |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4351 widget. CLIENT_DATA is a pointer to the scroll_bar structure for |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4352 the scroll bar. CALL_DATA is an integer specifying the action that |
| 48085 | 4353 has taken place. Its magnitude is in the range 0..height of the |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4354 scroll bar. Negative values mean scroll towards buffer start. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4355 Values < height of scroll bar mean line-wise movement. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4356 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4357 static void |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4358 xaw_scroll_callback (widget, client_data, call_data) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4359 Widget widget; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4360 XtPointer client_data, call_data; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4361 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4362 struct scroll_bar *bar = (struct scroll_bar *) client_data; |
| 48100 | 4363 /* The position really is stored cast to a pointer. */ |
| 4364 int position = (long) call_data; | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4365 Dimension height; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4366 int part; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4367 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4368 /* Get the height of the scroll bar. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4369 BLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4370 XtVaGetValues (widget, XtNheight, &height, NULL); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4371 UNBLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4372 |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4373 if (abs (position) >= height) |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4374 part = (position < 0) ? scroll_bar_above_handle : scroll_bar_below_handle; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4375 |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4376 /* If Xaw3d was compiled with ARROW_SCROLLBAR, |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4377 it maps line-movement to call_data = max(5, height/20). */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4378 else if (xaw3d_arrow_scroll && abs (position) <= max (5, height / 20)) |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4379 part = (position < 0) ? scroll_bar_up_arrow : scroll_bar_down_arrow; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4380 else |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4381 part = scroll_bar_move_ratio; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4382 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4383 window_being_scrolled = bar->window; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4384 bar->dragging = Qnil; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4385 last_scroll_bar_part = part; |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4386 x_send_scroll_bar_event (bar->window, part, position, height); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4387 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4388 |
| 49322 | 4389 #endif /* not USE_GTK */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4390 #endif /* not USE_MOTIF */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4391 |
| 49322 | 4392 #define SCROLL_BAR_NAME "verticalScrollBar" |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4393 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4394 /* Create the widget for scroll bar BAR on frame F. Record the widget |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4395 and X window of the scroll bar in BAR. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4396 |
| 49322 | 4397 #ifdef USE_GTK |
| 4398 static void | |
| 4399 x_create_toolkit_scroll_bar (f, bar) | |
| 4400 struct frame *f; | |
| 4401 struct scroll_bar *bar; | |
| 4402 { | |
| 4403 char *scroll_bar_name = SCROLL_BAR_NAME; | |
| 4404 | |
| 4405 BLOCK_INPUT; | |
| 4406 xg_create_scroll_bar (f, bar, G_CALLBACK (xg_scroll_callback), | |
| 4407 scroll_bar_name); | |
| 4408 UNBLOCK_INPUT; | |
| 4409 } | |
| 4410 | |
| 4411 #else /* not USE_GTK */ | |
| 4412 | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4413 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4414 x_create_toolkit_scroll_bar (f, bar) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4415 struct frame *f; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4416 struct scroll_bar *bar; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4417 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4418 Window xwindow; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4419 Widget widget; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4420 Arg av[20]; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4421 int ac = 0; |
| 49322 | 4422 char *scroll_bar_name = SCROLL_BAR_NAME; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4423 unsigned long pixel; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4424 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4425 BLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4426 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4427 #ifdef USE_MOTIF |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4428 /* Set resources. Create the widget. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4429 XtSetArg (av[ac], XtNmappedWhenManaged, False); ++ac; |
|
50324
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
4430 XtSetArg (av[ac], XmNminimum, 0); ++ac; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4431 XtSetArg (av[ac], XmNmaximum, XM_SB_MAX); ++ac; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4432 XtSetArg (av[ac], XmNorientation, XmVERTICAL); ++ac; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4433 XtSetArg (av[ac], XmNprocessingDirection, XmMAX_ON_BOTTOM), ++ac; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4434 XtSetArg (av[ac], XmNincrement, 1); ++ac; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4435 XtSetArg (av[ac], XmNpageIncrement, 1); ++ac; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4436 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4437 pixel = f->output_data.x->scroll_bar_foreground_pixel; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4438 if (pixel != -1) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4439 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4440 XtSetArg (av[ac], XmNforeground, pixel); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4441 ++ac; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4442 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4443 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4444 pixel = f->output_data.x->scroll_bar_background_pixel; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4445 if (pixel != -1) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4446 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4447 XtSetArg (av[ac], XmNbackground, pixel); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4448 ++ac; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4449 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4450 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4451 widget = XmCreateScrollBar (f->output_data.x->edit_widget, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4452 scroll_bar_name, av, ac); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4453 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4454 /* Add one callback for everything that can happen. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4455 XtAddCallback (widget, XmNdecrementCallback, xm_scroll_callback, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4456 (XtPointer) bar); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4457 XtAddCallback (widget, XmNdragCallback, xm_scroll_callback, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4458 (XtPointer) bar); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4459 XtAddCallback (widget, XmNincrementCallback, xm_scroll_callback, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4460 (XtPointer) bar); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4461 XtAddCallback (widget, XmNpageDecrementCallback, xm_scroll_callback, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4462 (XtPointer) bar); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4463 XtAddCallback (widget, XmNpageIncrementCallback, xm_scroll_callback, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4464 (XtPointer) bar); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4465 XtAddCallback (widget, XmNtoBottomCallback, xm_scroll_callback, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4466 (XtPointer) bar); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4467 XtAddCallback (widget, XmNtoTopCallback, xm_scroll_callback, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4468 (XtPointer) bar); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4469 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4470 /* Realize the widget. Only after that is the X window created. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4471 XtRealizeWidget (widget); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4472 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4473 /* Set the cursor to an arrow. I didn't find a resource to do that. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4474 And I'm wondering why it hasn't an arrow cursor by default. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4475 XDefineCursor (XtDisplay (widget), XtWindow (widget), |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4476 f->output_data.x->nontext_cursor); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4477 |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4478 #else /* !USE_MOTIF i.e. use Xaw */ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4479 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4480 /* Set resources. Create the widget. The background of the |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4481 Xaw3d scroll bar widget is a little bit light for my taste. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4482 We don't alter it here to let users change it according |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4483 to their taste with `emacs*verticalScrollBar.background: xxx'. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4484 XtSetArg (av[ac], XtNmappedWhenManaged, False); ++ac; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4485 XtSetArg (av[ac], XtNorientation, XtorientVertical); ++ac; |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4486 /* For smoother scrolling with Xaw3d -sm */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4487 /* XtSetArg (av[ac], XtNpickTop, True); ++ac; */ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4488 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4489 pixel = f->output_data.x->scroll_bar_foreground_pixel; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4490 if (pixel != -1) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4491 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4492 XtSetArg (av[ac], XtNforeground, pixel); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4493 ++ac; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4494 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4495 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4496 pixel = f->output_data.x->scroll_bar_background_pixel; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4497 if (pixel != -1) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4498 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4499 XtSetArg (av[ac], XtNbackground, pixel); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4500 ++ac; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4501 } |
|
39618
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4502 |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4503 /* Top/bottom shadow colors. */ |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4504 |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4505 /* Allocate them, if necessary. */ |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4506 if (f->output_data.x->scroll_bar_top_shadow_pixel == -1) |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4507 { |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4508 pixel = f->output_data.x->scroll_bar_background_pixel; |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4509 if (!x_alloc_lighter_color (f, FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f), |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4510 &pixel, 1.2, 0x8000)) |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4511 pixel = -1; |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4512 f->output_data.x->scroll_bar_top_shadow_pixel = pixel; |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4513 } |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4514 if (f->output_data.x->scroll_bar_bottom_shadow_pixel == -1) |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4515 { |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4516 pixel = f->output_data.x->scroll_bar_background_pixel; |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4517 if (!x_alloc_lighter_color (f, FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f), |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4518 &pixel, 0.6, 0x4000)) |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4519 pixel = -1; |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4520 f->output_data.x->scroll_bar_bottom_shadow_pixel = pixel; |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4521 } |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4522 |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4523 /* Tell the toolkit about them. */ |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4524 if (f->output_data.x->scroll_bar_top_shadow_pixel == -1 |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4525 || f->output_data.x->scroll_bar_bottom_shadow_pixel == -1) |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4526 /* We tried to allocate a color for the top/bottom shadow, and |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4527 failed, so tell Xaw3d to use dithering instead. */ |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4528 { |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4529 XtSetArg (av[ac], XtNbeNiceToColormap, True); |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4530 ++ac; |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4531 } |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4532 else |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4533 /* Tell what colors Xaw3d should use for the top/bottom shadow, to |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4534 be more consistent with other emacs 3d colors, and since Xaw3d is |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4535 not good at dealing with allocation failure. */ |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4536 { |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4537 /* This tells Xaw3d to use real colors instead of dithering for |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4538 the shadows. */ |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4539 XtSetArg (av[ac], XtNbeNiceToColormap, False); |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4540 ++ac; |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4541 |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4542 /* Specify the colors. */ |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4543 pixel = f->output_data.x->scroll_bar_top_shadow_pixel; |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4544 if (pixel != -1) |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4545 { |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4546 XtSetArg (av[ac], "topShadowPixel", pixel); |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4547 ++ac; |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4548 } |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4549 pixel = f->output_data.x->scroll_bar_bottom_shadow_pixel; |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4550 if (pixel != -1) |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4551 { |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4552 XtSetArg (av[ac], "bottomShadowPixel", pixel); |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4553 ++ac; |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4554 } |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4555 } |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
4556 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4557 widget = XtCreateWidget (scroll_bar_name, scrollbarWidgetClass, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4558 f->output_data.x->edit_widget, av, ac); |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4559 |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4560 { |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4561 char *initial = ""; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4562 char *val = initial; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4563 XtVaGetValues (widget, XtNscrollVCursor, (XtPointer) &val, |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4564 XtNpickTop, (XtPointer) &xaw3d_pick_top, NULL); |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4565 if (val == initial) |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4566 { /* ARROW_SCROLL */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4567 xaw3d_arrow_scroll = True; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4568 /* Isn't that just a personal preference ? -sm */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4569 XtVaSetValues (widget, XtNcursorName, "top_left_arrow", NULL); |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4570 } |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4571 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4572 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4573 /* Define callbacks. */ |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4574 XtAddCallback (widget, XtNjumpProc, xaw_jump_callback, (XtPointer) bar); |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4575 XtAddCallback (widget, XtNscrollProc, xaw_scroll_callback, |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4576 (XtPointer) bar); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4577 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4578 /* Realize the widget. Only after that is the X window created. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4579 XtRealizeWidget (widget); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4580 |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4581 #endif /* !USE_MOTIF */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4582 |
| 46814 | 4583 /* Install an action hook that lets us detect when the user |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4584 finishes interacting with a scroll bar. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4585 if (action_hook_id == 0) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4586 action_hook_id = XtAppAddActionHook (Xt_app_con, xt_action_hook, 0); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4587 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4588 /* Remember X window and widget in the scroll bar vector. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4589 SET_SCROLL_BAR_X_WIDGET (bar, widget); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4590 xwindow = XtWindow (widget); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4591 SET_SCROLL_BAR_X_WINDOW (bar, xwindow); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4592 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4593 UNBLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4594 } |
| 49322 | 4595 #endif /* not USE_GTK */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4596 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4597 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4598 /* Set the thumb size and position of scroll bar BAR. We are currently |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4599 displaying PORTION out of a whole WHOLE, and our position POSITION. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4600 |
| 49322 | 4601 #ifdef USE_GTK |
| 4602 static void | |
| 4603 x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole) | |
| 4604 struct scroll_bar *bar; | |
| 4605 int portion, position, whole; | |
| 4606 { | |
| 4607 xg_set_toolkit_scroll_bar_thumb (bar, portion, position, whole); | |
| 4608 } | |
| 4609 | |
| 4610 #else /* not USE_GTK */ | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4611 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4612 x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4613 struct scroll_bar *bar; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4614 int portion, position, whole; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4615 { |
|
33606
01f87b0ff56f
(x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create)
Gerd Moellmann <gerd@gnu.org>
parents:
33456
diff
changeset
|
4616 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); |
|
01f87b0ff56f
(x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create)
Gerd Moellmann <gerd@gnu.org>
parents:
33456
diff
changeset
|
4617 Widget widget = SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4618 float top, shown; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4619 |
|
43884
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4620 BLOCK_INPUT; |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4621 |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4622 #ifdef USE_MOTIF |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4623 |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4624 /* We use an estimate of 30 chars per line rather than the real |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4625 `portion' value. This has the disadvantage that the thumb size |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4626 is not very representative, but it makes our life a lot easier. |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4627 Otherwise, we have to constantly adjust the thumb size, which |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4628 we can't always do quickly enough: while dragging, the size of |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4629 the thumb might prevent the user from dragging the thumb all the |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4630 way to the end. but Motif and some versions of Xaw3d don't allow |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4631 updating the thumb size while dragging. Also, even if we can update |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4632 its size, the update will often happen too late. |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4633 If you don't believe it, check out revision 1.650 of xterm.c to see |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4634 what hoops we were going through and the still poor behavior we got. */ |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
4635 portion = WINDOW_TOTAL_LINES (XWINDOW (bar->window)) * 30; |
|
43884
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4636 /* When the thumb is at the bottom, position == whole. |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4637 So we need to increase `whole' to make space for the thumb. */ |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4638 whole += portion; |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4639 |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4640 if (whole <= 0) |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4641 top = 0, shown = 1; |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4642 else |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4643 { |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4644 top = (float) position / whole; |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4645 shown = (float) portion / whole; |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4646 } |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4647 |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4648 if (NILP (bar->dragging)) |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4649 { |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4650 int size, value; |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4651 |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4652 /* Slider size. Must be in the range [1 .. MAX - MIN] where MAX |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4653 is the scroll bar's maximum and MIN is the scroll bar's minimum |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4654 value. */ |
|
50324
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
4655 size = shown * XM_SB_MAX; |
|
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
4656 size = min (size, XM_SB_MAX); |
|
43884
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4657 size = max (size, 1); |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4658 |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4659 /* Position. Must be in the range [MIN .. MAX - SLIDER_SIZE]. */ |
|
50324
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
4660 value = top * XM_SB_MAX; |
|
43884
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4661 value = min (value, XM_SB_MAX - size); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4662 |
|
43884
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4663 XmScrollBarSetValues (widget, value, size, 0, 0, False); |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4664 } |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4665 #else /* !USE_MOTIF i.e. use Xaw */ |
|
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
4666 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4667 if (whole == 0) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4668 top = 0, shown = 1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4669 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4670 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4671 top = (float) position / whole; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4672 shown = (float) portion / whole; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4673 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4674 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4675 { |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4676 float old_top, old_shown; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4677 Dimension height; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4678 XtVaGetValues (widget, |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4679 XtNtopOfThumb, &old_top, |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4680 XtNshown, &old_shown, |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4681 XtNheight, &height, |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4682 NULL); |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4683 |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4684 /* Massage the top+shown values. */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4685 if (NILP (bar->dragging) || last_scroll_bar_part == scroll_bar_down_arrow) |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4686 top = max (0, min (1, top)); |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4687 else |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4688 top = old_top; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4689 /* Keep two pixels available for moving the thumb down. */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4690 shown = max (0, min (1 - top - (2.0 / height), shown)); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4691 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4692 /* If the call to XawScrollbarSetThumb below doesn't seem to work, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4693 check that your system's configuration file contains a define |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4694 for `NARROWPROTO'. See s/freebsd.h for an example. */ |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4695 if (top != old_top || shown != old_shown) |
|
25101
6b42357f28f9
(x_set_toolkit_scroll_bar_thumb): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25091
diff
changeset
|
4696 { |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4697 if (NILP (bar->dragging)) |
|
25101
6b42357f28f9
(x_set_toolkit_scroll_bar_thumb): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25091
diff
changeset
|
4698 XawScrollbarSetThumb (widget, top, shown); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4699 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4700 { |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4701 #ifdef HAVE_XAW3D |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4702 ScrollbarWidget sb = (ScrollbarWidget) widget; |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
4703 int scroll_mode = 0; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4704 |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4705 /* `scroll_mode' only exists with Xaw3d + ARROW_SCROLLBAR. */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4706 if (xaw3d_arrow_scroll) |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4707 { |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4708 /* Xaw3d stupidly ignores resize requests while dragging |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4709 so we have to make it believe it's not in dragging mode. */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4710 scroll_mode = sb->scrollbar.scroll_mode; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4711 if (scroll_mode == 2) |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4712 sb->scrollbar.scroll_mode = 0; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4713 } |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4714 #endif |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4715 /* Try to make the scrolling a tad smoother. */ |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4716 if (!xaw3d_pick_top) |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4717 shown = min (shown, old_shown); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4718 |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4719 XawScrollbarSetThumb (widget, top, shown); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4720 |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4721 #ifdef HAVE_XAW3D |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4722 if (xaw3d_arrow_scroll && scroll_mode == 2) |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4723 sb->scrollbar.scroll_mode = scroll_mode; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4724 #endif |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4725 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4726 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4727 } |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
4728 #endif /* !USE_MOTIF */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4729 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4730 UNBLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4731 } |
| 49322 | 4732 #endif /* not USE_GTK */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4733 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4734 #endif /* USE_TOOLKIT_SCROLL_BARS */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4735 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4736 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4737 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4738 /************************************************************************ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4739 Scroll bars, general |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4740 ************************************************************************/ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4741 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4742 /* Create a scroll bar and return the scroll bar vector for it. W is |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4743 the Emacs window on which to create the scroll bar. TOP, LEFT, |
| 43591 | 4744 WIDTH and HEIGHT are the pixel coordinates and dimensions of the |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4745 scroll bar. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4746 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4747 static struct scroll_bar * |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4748 x_scroll_bar_create (w, top, left, width, height) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4749 struct window *w; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4750 int top, left, width, height; |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4751 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4752 struct frame *f = XFRAME (w->frame); |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
4753 struct scroll_bar *bar |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
4754 = XSCROLL_BAR (Fmake_vector (make_number (SCROLL_BAR_VEC_SIZE), Qnil)); |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4755 |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4756 BLOCK_INPUT; |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4757 |
|
34066
2482c17f546e
Test USE_TOOLKIT_SCROLL_BARS everywhere with #ifdef and
Gerd Moellmann <gerd@gnu.org>
parents:
34030
diff
changeset
|
4758 #ifdef USE_TOOLKIT_SCROLL_BARS |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4759 x_create_toolkit_scroll_bar (f, bar); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4760 #else /* not USE_TOOLKIT_SCROLL_BARS */ |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4761 { |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4762 XSetWindowAttributes a; |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4763 unsigned long mask; |
|
25716
e2d5cd96727b
(x_scroll_bar_handle_click): Compile only if
Gerd Moellmann <gerd@gnu.org>
parents:
25692
diff
changeset
|
4764 Window window; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4765 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4766 a.background_pixel = f->output_data.x->scroll_bar_background_pixel; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4767 if (a.background_pixel == -1) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4768 a.background_pixel = f->output_data.x->background_pixel; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4769 |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4770 a.event_mask = (ButtonPressMask | ButtonReleaseMask |
|
1793
cf4c3f01ddb9
* xterm.c (x_scrollbar_create): Include PointerMotionHintMask in
Jim Blandy <jimb@redhat.com>
parents:
1787
diff
changeset
|
4771 | ButtonMotionMask | PointerMotionHintMask |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4772 | ExposureMask); |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
4773 a.cursor = FRAME_X_DISPLAY_INFO (f)->vertical_scroll_bar_cursor; |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
4774 |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
4775 mask = (CWBackPixel | CWEventMask | CWCursor); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4776 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4777 /* Clear the area of W that will serve as a scroll bar. This is |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4778 for the case that a window has been split horizontally. In |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4779 this case, no clear_frame is generated to reduce flickering. */ |
|
40610
e2da1b3f3d94
(x_scroll_bar_create): Check for width and height > 0.
Gerd Moellmann <gerd@gnu.org>
parents:
40514
diff
changeset
|
4780 if (width > 0 && height > 0) |
|
e2da1b3f3d94
(x_scroll_bar_create): Check for width and height > 0.
Gerd Moellmann <gerd@gnu.org>
parents:
40514
diff
changeset
|
4781 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
e2da1b3f3d94
(x_scroll_bar_create): Check for width and height > 0.
Gerd Moellmann <gerd@gnu.org>
parents:
40514
diff
changeset
|
4782 left, top, width, |
|
e2da1b3f3d94
(x_scroll_bar_create): Check for width and height > 0.
Gerd Moellmann <gerd@gnu.org>
parents:
40514
diff
changeset
|
4783 window_box_height (w), False); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4784 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4785 window = XCreateWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4786 /* Position and size of scroll bar. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4787 left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4788 top, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4789 width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4790 height, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4791 /* Border width, depth, class, and visual. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4792 0, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4793 CopyFromParent, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4794 CopyFromParent, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4795 CopyFromParent, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4796 /* Attributes. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4797 mask, &a); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4798 SET_SCROLL_BAR_X_WINDOW (bar, window); |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4799 } |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4800 #endif /* not USE_TOOLKIT_SCROLL_BARS */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4801 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4802 XSETWINDOW (bar->window, w); |
|
9338
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
4803 XSETINT (bar->top, top); |
|
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
4804 XSETINT (bar->left, left); |
|
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
4805 XSETINT (bar->width, width); |
|
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
4806 XSETINT (bar->height, height); |
|
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
4807 XSETINT (bar->start, 0); |
|
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
4808 XSETINT (bar->end, 0); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4809 bar->dragging = Qnil; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4810 |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4811 /* Add bar to its frame's list of scroll bars. */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
4812 bar->next = FRAME_SCROLL_BARS (f); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4813 bar->prev = Qnil; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
4814 XSETVECTOR (FRAME_SCROLL_BARS (f), bar); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4815 if (!NILP (bar->next)) |
|
9338
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
4816 XSETVECTOR (XSCROLL_BAR (bar->next)->prev, bar); |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4817 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4818 /* Map the window/widget. */ |
|
34066
2482c17f546e
Test USE_TOOLKIT_SCROLL_BARS everywhere with #ifdef and
Gerd Moellmann <gerd@gnu.org>
parents:
34030
diff
changeset
|
4819 #ifdef USE_TOOLKIT_SCROLL_BARS |
|
36475
488c4787ec0a
(XTset_vertical_scroll_bar): Don't clear a zero height
Gerd Moellmann <gerd@gnu.org>
parents:
36442
diff
changeset
|
4820 { |
| 49322 | 4821 #ifdef USE_GTK |
| 4822 xg_update_scrollbar_pos (f, | |
| 4823 SCROLL_BAR_X_WINDOW (bar), | |
| 4824 top, | |
| 4825 left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, | |
| 4826 width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, | |
|
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50247
diff
changeset
|
4827 max (height, 1), |
|
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50247
diff
changeset
|
4828 left, |
|
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50247
diff
changeset
|
4829 width); |
| 49322 | 4830 xg_show_scroll_bar (SCROLL_BAR_X_WINDOW (bar)); |
| 4831 #else /* not USE_GTK */ | |
|
36475
488c4787ec0a
(XTset_vertical_scroll_bar): Don't clear a zero height
Gerd Moellmann <gerd@gnu.org>
parents:
36442
diff
changeset
|
4832 Widget scroll_bar = SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar); |
|
488c4787ec0a
(XTset_vertical_scroll_bar): Don't clear a zero height
Gerd Moellmann <gerd@gnu.org>
parents:
36442
diff
changeset
|
4833 XtConfigureWidget (scroll_bar, |
|
488c4787ec0a
(XTset_vertical_scroll_bar): Don't clear a zero height
Gerd Moellmann <gerd@gnu.org>
parents:
36442
diff
changeset
|
4834 left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, |
|
488c4787ec0a
(XTset_vertical_scroll_bar): Don't clear a zero height
Gerd Moellmann <gerd@gnu.org>
parents:
36442
diff
changeset
|
4835 top, |
|
488c4787ec0a
(XTset_vertical_scroll_bar): Don't clear a zero height
Gerd Moellmann <gerd@gnu.org>
parents:
36442
diff
changeset
|
4836 width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, |
|
488c4787ec0a
(XTset_vertical_scroll_bar): Don't clear a zero height
Gerd Moellmann <gerd@gnu.org>
parents:
36442
diff
changeset
|
4837 max (height, 1), 0); |
|
488c4787ec0a
(XTset_vertical_scroll_bar): Don't clear a zero height
Gerd Moellmann <gerd@gnu.org>
parents:
36442
diff
changeset
|
4838 XtMapWidget (scroll_bar); |
| 49322 | 4839 #endif /* not USE_GTK */ |
|
36475
488c4787ec0a
(XTset_vertical_scroll_bar): Don't clear a zero height
Gerd Moellmann <gerd@gnu.org>
parents:
36442
diff
changeset
|
4840 } |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4841 #else /* not USE_TOOLKIT_SCROLL_BARS */ |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
4842 XMapRaised (FRAME_X_DISPLAY (f), SCROLL_BAR_X_WINDOW (bar)); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4843 #endif /* not USE_TOOLKIT_SCROLL_BARS */ |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4844 |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4845 UNBLOCK_INPUT; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4846 return bar; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4847 } |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4848 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4849 |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4850 /* Draw BAR's handle in the proper position. |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4851 |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4852 If the handle is already drawn from START to END, don't bother |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4853 redrawing it, unless REBUILD is non-zero; in that case, always |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4854 redraw it. (REBUILD is handy for drawing the handle after expose |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
4855 events.) |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4856 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4857 Normally, we want to constrain the start and end of the handle to |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4858 fit inside its rectangle, but if the user is dragging the scroll |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4859 bar handle, we want to let them drag it down all the way, so that |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4860 the bar's top is as far down as it goes; otherwise, there's no way |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4861 to move to the very end of the buffer. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4862 |
|
25716
e2d5cd96727b
(x_scroll_bar_handle_click): Compile only if
Gerd Moellmann <gerd@gnu.org>
parents:
25692
diff
changeset
|
4863 #ifndef USE_TOOLKIT_SCROLL_BARS |
|
e2d5cd96727b
(x_scroll_bar_handle_click): Compile only if
Gerd Moellmann <gerd@gnu.org>
parents:
25692
diff
changeset
|
4864 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4865 static void |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4866 x_scroll_bar_set_handle (bar, start, end, rebuild) |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4867 struct scroll_bar *bar; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4868 int start, end; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4869 int rebuild; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4870 { |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4871 int dragging = ! NILP (bar->dragging); |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4872 Window w = SCROLL_BAR_X_WINDOW (bar); |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
4873 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
4874 GC gc = f->output_data.x->normal_gc; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4875 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4876 /* If the display is already accurate, do nothing. */ |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4877 if (! rebuild |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4878 && start == XINT (bar->start) |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4879 && end == XINT (bar->end)) |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4880 return; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4881 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4882 BLOCK_INPUT; |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4883 |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4884 { |
|
16251
ec1b1ae37295
Pass frame arg in calls to VERTICAL_SCROLL_BAR_INSIDE_HEIGHT
Richard M. Stallman <rms@gnu.org>
parents:
16220
diff
changeset
|
4885 int inside_width = VERTICAL_SCROLL_BAR_INSIDE_WIDTH (f, XINT (bar->width)); |
|
ec1b1ae37295
Pass frame arg in calls to VERTICAL_SCROLL_BAR_INSIDE_HEIGHT
Richard M. Stallman <rms@gnu.org>
parents:
16220
diff
changeset
|
4886 int inside_height = VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (f, XINT (bar->height)); |
|
ec1b1ae37295
Pass frame arg in calls to VERTICAL_SCROLL_BAR_INSIDE_HEIGHT
Richard M. Stallman <rms@gnu.org>
parents:
16220
diff
changeset
|
4887 int top_range = VERTICAL_SCROLL_BAR_TOP_RANGE (f, XINT (bar->height)); |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4888 |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4889 /* Make sure the values are reasonable, and try to preserve |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4890 the distance between start and end. */ |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4891 { |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4892 int length = end - start; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4893 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4894 if (start < 0) |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4895 start = 0; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4896 else if (start > top_range) |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4897 start = top_range; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4898 end = start + length; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4899 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4900 if (end < start) |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4901 end = start; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4902 else if (end > top_range && ! dragging) |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4903 end = top_range; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4904 } |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4905 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4906 /* Store the adjusted setting in the scroll bar. */ |
|
9338
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
4907 XSETINT (bar->start, start); |
|
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
4908 XSETINT (bar->end, end); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4909 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4910 /* Clip the end position, just for display. */ |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4911 if (end > top_range) |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4912 end = top_range; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4913 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4914 /* Draw bottom positions VERTICAL_SCROLL_BAR_MIN_HANDLE pixels |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4915 below top positions, to make sure the handle is always at least |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4916 that many pixels tall. */ |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4917 end += VERTICAL_SCROLL_BAR_MIN_HANDLE; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4918 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4919 /* Draw the empty space above the handle. Note that we can't clear |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4920 zero-height areas; that means "clear to end of window." */ |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4921 if (0 < start) |
|
35581
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
4922 x_clear_area (FRAME_X_DISPLAY (f), w, |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
4923 /* x, y, width, height, and exposures. */ |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
4924 VERTICAL_SCROLL_BAR_LEFT_BORDER, |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
4925 VERTICAL_SCROLL_BAR_TOP_BORDER, |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
4926 inside_width, start, |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
4927 False); |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4928 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4929 /* Change to proper foreground color if one is specified. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4930 if (f->output_data.x->scroll_bar_foreground_pixel != -1) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4931 XSetForeground (FRAME_X_DISPLAY (f), gc, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4932 f->output_data.x->scroll_bar_foreground_pixel); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4933 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4934 /* Draw the handle itself. */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
4935 XFillRectangle (FRAME_X_DISPLAY (f), w, gc, |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4936 /* x, y, width, height */ |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4937 VERTICAL_SCROLL_BAR_LEFT_BORDER, |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4938 VERTICAL_SCROLL_BAR_TOP_BORDER + start, |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4939 inside_width, end - start); |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4940 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4941 /* Restore the foreground color of the GC if we changed it above. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4942 if (f->output_data.x->scroll_bar_foreground_pixel != -1) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4943 XSetForeground (FRAME_X_DISPLAY (f), gc, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4944 f->output_data.x->foreground_pixel); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4945 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4946 /* Draw the empty space below the handle. Note that we can't |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4947 clear zero-height areas; that means "clear to end of window." */ |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4948 if (end < inside_height) |
|
35581
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
4949 x_clear_area (FRAME_X_DISPLAY (f), w, |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
4950 /* x, y, width, height, and exposures. */ |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
4951 VERTICAL_SCROLL_BAR_LEFT_BORDER, |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
4952 VERTICAL_SCROLL_BAR_TOP_BORDER + end, |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
4953 inside_width, inside_height - end, |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
4954 False); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4955 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4956 } |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4957 |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4958 UNBLOCK_INPUT; |
|
25716
e2d5cd96727b
(x_scroll_bar_handle_click): Compile only if
Gerd Moellmann <gerd@gnu.org>
parents:
25692
diff
changeset
|
4959 } |
|
e2d5cd96727b
(x_scroll_bar_handle_click): Compile only if
Gerd Moellmann <gerd@gnu.org>
parents:
25692
diff
changeset
|
4960 |
|
e2d5cd96727b
(x_scroll_bar_handle_click): Compile only if
Gerd Moellmann <gerd@gnu.org>
parents:
25692
diff
changeset
|
4961 #endif /* !USE_TOOLKIT_SCROLL_BARS */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4962 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4963 /* Destroy scroll bar BAR, and set its Emacs window's scroll bar to |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4964 nil. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4965 |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4966 static void |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4967 x_scroll_bar_remove (bar) |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4968 struct scroll_bar *bar; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4969 { |
|
33606
01f87b0ff56f
(x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create)
Gerd Moellmann <gerd@gnu.org>
parents:
33456
diff
changeset
|
4970 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4971 BLOCK_INPUT; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4972 |
|
34066
2482c17f546e
Test USE_TOOLKIT_SCROLL_BARS everywhere with #ifdef and
Gerd Moellmann <gerd@gnu.org>
parents:
34030
diff
changeset
|
4973 #ifdef USE_TOOLKIT_SCROLL_BARS |
| 49322 | 4974 #ifdef USE_GTK |
| 4975 xg_remove_scroll_bar (f, SCROLL_BAR_X_WINDOW (bar)); | |
| 4976 #else /* not USE_GTK */ | |
|
33606
01f87b0ff56f
(x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create)
Gerd Moellmann <gerd@gnu.org>
parents:
33456
diff
changeset
|
4977 XtDestroyWidget (SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar)); |
| 49322 | 4978 #endif /* not USE_GTK */ |
|
33606
01f87b0ff56f
(x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create)
Gerd Moellmann <gerd@gnu.org>
parents:
33456
diff
changeset
|
4979 #else |
|
01f87b0ff56f
(x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create)
Gerd Moellmann <gerd@gnu.org>
parents:
33456
diff
changeset
|
4980 XDestroyWindow (FRAME_X_DISPLAY (f), SCROLL_BAR_X_WINDOW (bar)); |
|
01f87b0ff56f
(x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create)
Gerd Moellmann <gerd@gnu.org>
parents:
33456
diff
changeset
|
4981 #endif |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
4982 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4983 /* Disassociate this scroll bar from its window. */ |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4984 XWINDOW (bar->window)->vertical_scroll_bar = Qnil; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4985 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4986 UNBLOCK_INPUT; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4987 } |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4988 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4989 |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4990 /* Set the handle of the vertical scroll bar for WINDOW to indicate |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4991 that we are displaying PORTION characters out of a total of WHOLE |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
4992 characters, starting at POSITION. If WINDOW has no scroll bar, |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
4993 create one. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4994 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4995 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4996 XTset_vertical_scroll_bar (w, portion, whole, position) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
4997 struct window *w; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4998 int portion, whole, position; |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
4999 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5000 struct frame *f = XFRAME (w->frame); |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5001 struct scroll_bar *bar; |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5002 int top, height, left, sb_left, width, sb_width; |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
5003 int window_y, window_height; |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5004 |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5005 /* Get window dimensions. */ |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
5006 window_box (w, -1, 0, &window_y, 0, &window_height); |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5007 top = window_y; |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
5008 width = WINDOW_CONFIG_SCROLL_BAR_COLS (w) * FRAME_COLUMN_WIDTH (f); |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5009 height = window_height; |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5010 |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5011 /* Compute the left edge of the scroll bar area. */ |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
5012 left = WINDOW_SCROLL_BAR_AREA_X (w); |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5013 |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5014 /* Compute the width of the scroll bar which might be less than |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5015 the width of the area reserved for the scroll bar. */ |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
5016 if (WINDOW_CONFIG_SCROLL_BAR_WIDTH (w) > 0) |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
5017 sb_width = WINDOW_CONFIG_SCROLL_BAR_WIDTH (w); |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5018 else |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5019 sb_width = width; |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5020 |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5021 /* Compute the left edge of the scroll bar. */ |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5022 #ifdef USE_TOOLKIT_SCROLL_BARS |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
5023 if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w)) |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
5024 sb_left = left + width - sb_width - (width - sb_width) / 2; |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5025 else |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5026 sb_left = left + (width - sb_width) / 2; |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5027 #else |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
5028 if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w)) |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
5029 sb_left = left + width - sb_width; |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5030 else |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5031 sb_left = left; |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5032 #endif |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
5033 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5034 /* Does the scroll bar exist yet? */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5035 if (NILP (w->vertical_scroll_bar)) |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5036 { |
|
40610
e2da1b3f3d94
(x_scroll_bar_create): Check for width and height > 0.
Gerd Moellmann <gerd@gnu.org>
parents:
40514
diff
changeset
|
5037 if (width > 0 && height > 0) |
|
40257
98531a716f48
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40248
diff
changeset
|
5038 { |
|
98531a716f48
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40248
diff
changeset
|
5039 BLOCK_INPUT; |
|
98531a716f48
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40248
diff
changeset
|
5040 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
98531a716f48
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40248
diff
changeset
|
5041 left, top, width, height, False); |
|
98531a716f48
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40248
diff
changeset
|
5042 UNBLOCK_INPUT; |
|
98531a716f48
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40248
diff
changeset
|
5043 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
5044 |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5045 bar = x_scroll_bar_create (w, top, sb_left, sb_width, height); |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5046 } |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5047 else |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5048 { |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5049 /* It may just need to be moved and resized. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5050 unsigned int mask = 0; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
5051 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5052 bar = XSCROLL_BAR (w->vertical_scroll_bar); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5053 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5054 BLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5055 |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5056 if (sb_left != XINT (bar->left)) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5057 mask |= CWX; |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5058 if (top != XINT (bar->top)) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5059 mask |= CWY; |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5060 if (sb_width != XINT (bar->width)) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5061 mask |= CWWidth; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
5062 if (height != XINT (bar->height)) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5063 mask |= CWHeight; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
5064 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5065 #ifdef USE_TOOLKIT_SCROLL_BARS |
|
25269
621067279f19
(XTset_vertical_scroll_bar) [USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
25191
diff
changeset
|
5066 |
| 49322 | 5067 #ifdef USE_GTK |
| 5068 if (mask) | |
| 5069 xg_update_scrollbar_pos (f, | |
| 5070 SCROLL_BAR_X_WINDOW (bar), | |
| 5071 top, | |
| 5072 sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, | |
| 5073 sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, | |
|
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50247
diff
changeset
|
5074 max (height, 1), |
|
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50247
diff
changeset
|
5075 left, |
|
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50247
diff
changeset
|
5076 width); |
| 49322 | 5077 #else /* not USE_GTK */ |
| 5078 | |
|
25269
621067279f19
(XTset_vertical_scroll_bar) [USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
25191
diff
changeset
|
5079 /* Since toolkit scroll bars are smaller than the space reserved |
| 49322 | 5080 for them on the frame, we have to clear "under" them. */ |
|
40610
e2da1b3f3d94
(x_scroll_bar_create): Check for width and height > 0.
Gerd Moellmann <gerd@gnu.org>
parents:
40514
diff
changeset
|
5081 if (width > 0 && height > 0) |
| 49322 | 5082 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
| 5083 left, top, width, height, False); | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5084 /* Move/size the scroll bar widget. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5085 if (mask) |
| 49322 | 5086 XtConfigureWidget (SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar), |
| 5087 sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, | |
| 5088 top, | |
| 5089 sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, | |
| 5090 max (height, 1), 0); | |
| 5091 | |
| 5092 #endif /* not USE_GTK */ | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5093 #else /* not USE_TOOLKIT_SCROLL_BARS */ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
5094 |
|
36880
f9243c6624b0
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
36824
diff
changeset
|
5095 /* Clear areas not covered by the scroll bar because of |
|
f9243c6624b0
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
36824
diff
changeset
|
5096 VERTICAL_SCROLL_BAR_WIDTH_TRIM. */ |
|
25633
ddf2e1fef00b
(XTread_socket): In XSetInputFocus, use RevertToParent,
Richard M. Stallman <rms@gnu.org>
parents:
25546
diff
changeset
|
5097 if (VERTICAL_SCROLL_BAR_WIDTH_TRIM) |
|
ddf2e1fef00b
(XTread_socket): In XSetInputFocus, use RevertToParent,
Richard M. Stallman <rms@gnu.org>
parents:
25546
diff
changeset
|
5098 { |
|
35581
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
5099 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
5100 left, top, VERTICAL_SCROLL_BAR_WIDTH_TRIM, |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
5101 height, False); |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
5102 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
5103 left + width - VERTICAL_SCROLL_BAR_WIDTH_TRIM, |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
5104 top, VERTICAL_SCROLL_BAR_WIDTH_TRIM, |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
5105 height, False); |
|
25633
ddf2e1fef00b
(XTread_socket): In XSetInputFocus, use RevertToParent,
Richard M. Stallman <rms@gnu.org>
parents:
25546
diff
changeset
|
5106 } |
|
36880
f9243c6624b0
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
36824
diff
changeset
|
5107 |
|
f9243c6624b0
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
36824
diff
changeset
|
5108 /* Clear areas not covered by the scroll bar because it's not as |
| 43591 | 5109 wide as the area reserved for it. This makes sure a |
|
36880
f9243c6624b0
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
36824
diff
changeset
|
5110 previous mode line display is cleared after C-x 2 C-x 1, for |
|
f9243c6624b0
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
36824
diff
changeset
|
5111 example. */ |
|
f9243c6624b0
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
36824
diff
changeset
|
5112 { |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
5113 int area_width = WINDOW_CONFIG_SCROLL_BAR_COLS (w) * FRAME_COLUMN_WIDTH (f); |
|
36880
f9243c6624b0
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
36824
diff
changeset
|
5114 int rest = area_width - sb_width; |
|
40329
c1762ce8905b
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40303
diff
changeset
|
5115 if (rest > 0 && height > 0) |
|
c1762ce8905b
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40303
diff
changeset
|
5116 { |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
5117 if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w)) |
|
40329
c1762ce8905b
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40303
diff
changeset
|
5118 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
c1762ce8905b
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40303
diff
changeset
|
5119 left + area_width - rest, top, |
|
c1762ce8905b
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40303
diff
changeset
|
5120 rest, height, False); |
|
c1762ce8905b
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40303
diff
changeset
|
5121 else |
|
c1762ce8905b
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40303
diff
changeset
|
5122 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
c1762ce8905b
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40303
diff
changeset
|
5123 left, top, rest, height, False); |
|
c1762ce8905b
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
40303
diff
changeset
|
5124 } |
|
36880
f9243c6624b0
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
36824
diff
changeset
|
5125 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
5126 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5127 /* Move/size the scroll bar window. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5128 if (mask) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5129 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5130 XWindowChanges wc; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
5131 |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5132 wc.x = sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM; |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5133 wc.y = top; |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5134 wc.width = sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2; |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5135 wc.height = height; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5136 XConfigureWindow (FRAME_X_DISPLAY (f), SCROLL_BAR_X_WINDOW (bar), |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5137 mask, &wc); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5138 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
5139 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5140 #endif /* not USE_TOOLKIT_SCROLL_BARS */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5141 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5142 /* Remember new settings. */ |
|
25512
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5143 XSETINT (bar->left, sb_left); |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5144 XSETINT (bar->top, top); |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5145 XSETINT (bar->width, sb_width); |
|
8d013f20532c
(x_scroll_bar_create): Don't clear under scroll bar
Gerd Moellmann <gerd@gnu.org>
parents:
25465
diff
changeset
|
5146 XSETINT (bar->height, height); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
5147 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5148 UNBLOCK_INPUT; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5149 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5150 |
|
34066
2482c17f546e
Test USE_TOOLKIT_SCROLL_BARS everywhere with #ifdef and
Gerd Moellmann <gerd@gnu.org>
parents:
34030
diff
changeset
|
5151 #ifdef USE_TOOLKIT_SCROLL_BARS |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5152 x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5153 #else /* not USE_TOOLKIT_SCROLL_BARS */ |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5154 /* Set the scroll bar's current state, unless we're currently being |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5155 dragged. */ |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5156 if (NILP (bar->dragging)) |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5157 { |
|
25541
be975dcf4a0c
(XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
Gerd Moellmann <gerd@gnu.org>
parents:
25529
diff
changeset
|
5158 int top_range = VERTICAL_SCROLL_BAR_TOP_RANGE (f, height); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5159 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5160 if (whole == 0) |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5161 x_scroll_bar_set_handle (bar, 0, top_range, 0); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5162 else |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5163 { |
|
3686
910ea1d66bfd
* xterm.c (XTset_vertical_scroll_bar): Use double type for
Jim Blandy <jimb@redhat.com>
parents:
3683
diff
changeset
|
5164 int start = ((double) position * top_range) / whole; |
|
910ea1d66bfd
* xterm.c (XTset_vertical_scroll_bar): Use double type for
Jim Blandy <jimb@redhat.com>
parents:
3683
diff
changeset
|
5165 int end = ((double) (position + portion) * top_range) / whole; |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5166 x_scroll_bar_set_handle (bar, start, end, 0); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5167 } |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5168 } |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5169 #endif /* not USE_TOOLKIT_SCROLL_BARS */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5170 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5171 XSETVECTOR (w->vertical_scroll_bar, bar); |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5172 } |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5173 |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5174 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5175 /* The following three hooks are used when we're doing a thorough |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5176 redisplay of the frame. We don't explicitly know which scroll bars |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5177 are going to be deleted, because keeping track of when windows go |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5178 away is a real pain - "Can you say set-window-configuration, boys |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5179 and girls?" Instead, we just assert at the beginning of redisplay |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5180 that *all* scroll bars are to be removed, and then save a scroll bar |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5181 from the fiery pit when we actually redisplay its window. */ |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5182 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5183 /* Arrange for all scroll bars on FRAME to be removed at the next call |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5184 to `*judge_scroll_bars_hook'. A scroll bar may be spared if |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5185 `*redeem_scroll_bar_hook' is applied to its window before the judgment. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5186 |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
5187 static void |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5188 XTcondemn_scroll_bars (frame) |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5189 FRAME_PTR frame; |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5190 { |
|
13205
8eac10febc8e
(x_connection_signal_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12966
diff
changeset
|
5191 /* Transfer all the scroll bars to FRAME_CONDEMNED_SCROLL_BARS. */ |
|
8eac10febc8e
(x_connection_signal_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12966
diff
changeset
|
5192 while (! NILP (FRAME_SCROLL_BARS (frame))) |
|
8eac10febc8e
(x_connection_signal_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12966
diff
changeset
|
5193 { |
|
8eac10febc8e
(x_connection_signal_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12966
diff
changeset
|
5194 Lisp_Object bar; |
|
8eac10febc8e
(x_connection_signal_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12966
diff
changeset
|
5195 bar = FRAME_SCROLL_BARS (frame); |
|
8eac10febc8e
(x_connection_signal_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12966
diff
changeset
|
5196 FRAME_SCROLL_BARS (frame) = XSCROLL_BAR (bar)->next; |
|
8eac10febc8e
(x_connection_signal_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12966
diff
changeset
|
5197 XSCROLL_BAR (bar)->next = FRAME_CONDEMNED_SCROLL_BARS (frame); |
|
8eac10febc8e
(x_connection_signal_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12966
diff
changeset
|
5198 XSCROLL_BAR (bar)->prev = Qnil; |
|
8eac10febc8e
(x_connection_signal_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12966
diff
changeset
|
5199 if (! NILP (FRAME_CONDEMNED_SCROLL_BARS (frame))) |
|
8eac10febc8e
(x_connection_signal_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12966
diff
changeset
|
5200 XSCROLL_BAR (FRAME_CONDEMNED_SCROLL_BARS (frame))->prev = bar; |
|
8eac10febc8e
(x_connection_signal_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12966
diff
changeset
|
5201 FRAME_CONDEMNED_SCROLL_BARS (frame) = bar; |
|
8eac10febc8e
(x_connection_signal_1): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12966
diff
changeset
|
5202 } |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5203 } |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5204 |
|
33303
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5205 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5206 /* Un-mark WINDOW's scroll bar for deletion in this judgment cycle. |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5207 Note that WINDOW isn't necessarily condemned at all. */ |
|
33303
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5208 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5209 static void |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5210 XTredeem_scroll_bar (window) |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5211 struct window *window; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5212 { |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5213 struct scroll_bar *bar; |
|
33303
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5214 struct frame *f; |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5215 |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5216 /* We can't redeem this window's scroll bar if it doesn't have one. */ |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5217 if (NILP (window->vertical_scroll_bar)) |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5218 abort (); |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5219 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5220 bar = XSCROLL_BAR (window->vertical_scroll_bar); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5221 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5222 /* Unlink it from the condemned list. */ |
|
33303
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5223 f = XFRAME (WINDOW_FRAME (window)); |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5224 if (NILP (bar->prev)) |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5225 { |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5226 /* If the prev pointer is nil, it must be the first in one of |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5227 the lists. */ |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5228 if (EQ (FRAME_SCROLL_BARS (f), window->vertical_scroll_bar)) |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5229 /* It's not condemned. Everything's fine. */ |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5230 return; |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5231 else if (EQ (FRAME_CONDEMNED_SCROLL_BARS (f), |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5232 window->vertical_scroll_bar)) |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5233 FRAME_CONDEMNED_SCROLL_BARS (f) = bar->next; |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5234 else |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5235 /* If its prev pointer is nil, it must be at the front of |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5236 one or the other! */ |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5237 abort (); |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5238 } |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5239 else |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5240 XSCROLL_BAR (bar->prev)->next = bar->next; |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5241 |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5242 if (! NILP (bar->next)) |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5243 XSCROLL_BAR (bar->next)->prev = bar->prev; |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5244 |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5245 bar->next = FRAME_SCROLL_BARS (f); |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5246 bar->prev = Qnil; |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5247 XSETVECTOR (FRAME_SCROLL_BARS (f), bar); |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5248 if (! NILP (bar->next)) |
|
1dc1953987a7
(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
Gerd Moellmann <gerd@gnu.org>
parents:
33289
diff
changeset
|
5249 XSETVECTOR (XSCROLL_BAR (bar->next)->prev, bar); |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5250 } |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5251 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5252 /* Remove all scroll bars on FRAME that haven't been saved since the |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5253 last call to `*condemn_scroll_bars_hook'. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5254 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5255 static void |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5256 XTjudge_scroll_bars (f) |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5257 FRAME_PTR f; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5258 { |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5259 Lisp_Object bar, next; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5260 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5261 bar = FRAME_CONDEMNED_SCROLL_BARS (f); |
|
1803
5752a95053f2
* xterm.c (x_window_to_scrollbar): Search frames'
Jim Blandy <jimb@redhat.com>
parents:
1793
diff
changeset
|
5262 |
|
5752a95053f2
* xterm.c (x_window_to_scrollbar): Search frames'
Jim Blandy <jimb@redhat.com>
parents:
1793
diff
changeset
|
5263 /* Clear out the condemned list now so we won't try to process any |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5264 more events on the hapless scroll bars. */ |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5265 FRAME_CONDEMNED_SCROLL_BARS (f) = Qnil; |
|
1803
5752a95053f2
* xterm.c (x_window_to_scrollbar): Search frames'
Jim Blandy <jimb@redhat.com>
parents:
1793
diff
changeset
|
5266 |
|
5752a95053f2
* xterm.c (x_window_to_scrollbar): Search frames'
Jim Blandy <jimb@redhat.com>
parents:
1793
diff
changeset
|
5267 for (; ! NILP (bar); bar = next) |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5268 { |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5269 struct scroll_bar *b = XSCROLL_BAR (bar); |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5270 |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5271 x_scroll_bar_remove (b); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5272 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5273 next = b->next; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5274 b->next = b->prev = Qnil; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5275 } |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5276 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5277 /* Now there should be no references to the condemned scroll bars, |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5278 and they should get garbage-collected. */ |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5279 } |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5280 |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5281 |
|
50324
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
5282 #ifndef USE_TOOLKIT_SCROLL_BARS |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5283 /* Handle an Expose or GraphicsExpose event on a scroll bar. This |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5284 is a no-op when using toolkit scroll bars. |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5285 |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5286 This may be called from a signal handler, so we have to ignore GC |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5287 mark bits. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5288 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5289 static void |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5290 x_scroll_bar_expose (bar, event) |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5291 struct scroll_bar *bar; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5292 XEvent *event; |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5293 { |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5294 Window w = SCROLL_BAR_X_WINDOW (bar); |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
5295 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
5296 GC gc = f->output_data.x->normal_gc; |
|
16301
a02555b4b2b9
(x_scroll_bar_create, x_scroll_bar_move):
Richard M. Stallman <rms@gnu.org>
parents:
16251
diff
changeset
|
5297 int width_trim = VERTICAL_SCROLL_BAR_WIDTH_TRIM; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5298 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5299 BLOCK_INPUT; |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5300 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5301 x_scroll_bar_set_handle (bar, XINT (bar->start), XINT (bar->end), 1); |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5302 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5303 /* Draw a one-pixel border just inside the edges of the scroll bar. */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
5304 XDrawRectangle (FRAME_X_DISPLAY (f), w, gc, |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5305 |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5306 /* x, y, width, height */ |
|
16251
ec1b1ae37295
Pass frame arg in calls to VERTICAL_SCROLL_BAR_INSIDE_HEIGHT
Richard M. Stallman <rms@gnu.org>
parents:
16220
diff
changeset
|
5307 0, 0, |
|
16301
a02555b4b2b9
(x_scroll_bar_create, x_scroll_bar_move):
Richard M. Stallman <rms@gnu.org>
parents:
16251
diff
changeset
|
5308 XINT (bar->width) - 1 - width_trim - width_trim, |
|
16251
ec1b1ae37295
Pass frame arg in calls to VERTICAL_SCROLL_BAR_INSIDE_HEIGHT
Richard M. Stallman <rms@gnu.org>
parents:
16220
diff
changeset
|
5309 XINT (bar->height) - 1); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
5310 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5311 UNBLOCK_INPUT; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5312 |
|
50324
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
5313 } |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5314 #endif /* not USE_TOOLKIT_SCROLL_BARS */ |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5315 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5316 /* Handle a mouse click on the scroll bar BAR. If *EMACS_EVENT's kind |
|
45803
9484de301252
Rename enum event_kind items.
Pavel Jan?k <Pavel@Janik.cz>
parents:
45563
diff
changeset
|
5317 is set to something other than NO_EVENT, it is enqueued. |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5318 |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5319 This may be called from a signal handler, so we have to ignore GC |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5320 mark bits. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5321 |
|
25716
e2d5cd96727b
(x_scroll_bar_handle_click): Compile only if
Gerd Moellmann <gerd@gnu.org>
parents:
25692
diff
changeset
|
5322 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5323 static void |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5324 x_scroll_bar_handle_click (bar, event, emacs_event) |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5325 struct scroll_bar *bar; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5326 XEvent *event; |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5327 struct input_event *emacs_event; |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5328 { |
|
10287
2e96f9f98276
(x_scroll_bar_handle_click): Use GC_WINDOWP.
Richard M. Stallman <rms@gnu.org>
parents:
10274
diff
changeset
|
5329 if (! GC_WINDOWP (bar->window)) |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5330 abort (); |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5331 |
|
45803
9484de301252
Rename enum event_kind items.
Pavel Jan?k <Pavel@Janik.cz>
parents:
45563
diff
changeset
|
5332 emacs_event->kind = SCROLL_BAR_CLICK_EVENT; |
|
5228
c094c1df2e87
(XTread_socket): Don't offset keysym here.
Richard M. Stallman <rms@gnu.org>
parents:
5156
diff
changeset
|
5333 emacs_event->code = event->xbutton.button - Button1; |
|
10287
2e96f9f98276
(x_scroll_bar_handle_click): Use GC_WINDOWP.
Richard M. Stallman <rms@gnu.org>
parents:
10274
diff
changeset
|
5334 emacs_event->modifiers |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
5335 = (x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO |
|
10287
2e96f9f98276
(x_scroll_bar_handle_click): Use GC_WINDOWP.
Richard M. Stallman <rms@gnu.org>
parents:
10274
diff
changeset
|
5336 (XFRAME (WINDOW_FRAME (XWINDOW (bar->window)))), |
|
2e96f9f98276
(x_scroll_bar_handle_click): Use GC_WINDOWP.
Richard M. Stallman <rms@gnu.org>
parents:
10274
diff
changeset
|
5337 event->xbutton.state) |
|
2e96f9f98276
(x_scroll_bar_handle_click): Use GC_WINDOWP.
Richard M. Stallman <rms@gnu.org>
parents:
10274
diff
changeset
|
5338 | (event->type == ButtonRelease |
|
2e96f9f98276
(x_scroll_bar_handle_click): Use GC_WINDOWP.
Richard M. Stallman <rms@gnu.org>
parents:
10274
diff
changeset
|
5339 ? up_modifier |
|
2e96f9f98276
(x_scroll_bar_handle_click): Use GC_WINDOWP.
Richard M. Stallman <rms@gnu.org>
parents:
10274
diff
changeset
|
5340 : down_modifier)); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5341 emacs_event->frame_or_window = bar->window; |
|
30197
3237a5529020
(construct_mouse_click, x_scroll_bar_to_input_event)
Gerd Moellmann <gerd@gnu.org>
parents:
30182
diff
changeset
|
5342 emacs_event->arg = Qnil; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5343 emacs_event->timestamp = event->xbutton.time; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5344 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5345 #if 0 |
|
16251
ec1b1ae37295
Pass frame arg in calls to VERTICAL_SCROLL_BAR_INSIDE_HEIGHT
Richard M. Stallman <rms@gnu.org>
parents:
16220
diff
changeset
|
5346 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); |
|
10287
2e96f9f98276
(x_scroll_bar_handle_click): Use GC_WINDOWP.
Richard M. Stallman <rms@gnu.org>
parents:
10274
diff
changeset
|
5347 int internal_height |
|
16251
ec1b1ae37295
Pass frame arg in calls to VERTICAL_SCROLL_BAR_INSIDE_HEIGHT
Richard M. Stallman <rms@gnu.org>
parents:
16220
diff
changeset
|
5348 = VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (f, XINT (bar->height)); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5349 #endif |
|
10287
2e96f9f98276
(x_scroll_bar_handle_click): Use GC_WINDOWP.
Richard M. Stallman <rms@gnu.org>
parents:
10274
diff
changeset
|
5350 int top_range |
|
16251
ec1b1ae37295
Pass frame arg in calls to VERTICAL_SCROLL_BAR_INSIDE_HEIGHT
Richard M. Stallman <rms@gnu.org>
parents:
16220
diff
changeset
|
5351 = VERTICAL_SCROLL_BAR_TOP_RANGE (f, XINT (bar->height)); |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5352 int y = event->xbutton.y - VERTICAL_SCROLL_BAR_TOP_BORDER; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5353 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5354 if (y < 0) y = 0; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5355 if (y > top_range) y = top_range; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5356 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5357 if (y < XINT (bar->start)) |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5358 emacs_event->part = scroll_bar_above_handle; |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5359 else if (y < XINT (bar->end) + VERTICAL_SCROLL_BAR_MIN_HANDLE) |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5360 emacs_event->part = scroll_bar_handle; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5361 else |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5362 emacs_event->part = scroll_bar_below_handle; |
|
2953
5440f00480e6
* xterm.c (x_scroll_bar_handle_click): Never grab the scroll bar;
Jim Blandy <jimb@redhat.com>
parents:
2923
diff
changeset
|
5363 |
|
5440f00480e6
* xterm.c (x_scroll_bar_handle_click): Never grab the scroll bar;
Jim Blandy <jimb@redhat.com>
parents:
2923
diff
changeset
|
5364 /* Just because the user has clicked on the handle doesn't mean |
|
2958
3124e6244d1a
* xterm.c (x_scroll_bar_handle_click): Never grab the scroll bar;
Jim Blandy <jimb@redhat.com>
parents:
2953
diff
changeset
|
5365 they want to drag it. Lisp code needs to be able to decide |
|
3124e6244d1a
* xterm.c (x_scroll_bar_handle_click): Never grab the scroll bar;
Jim Blandy <jimb@redhat.com>
parents:
2953
diff
changeset
|
5366 whether or not we're dragging. */ |
|
2953
5440f00480e6
* xterm.c (x_scroll_bar_handle_click): Never grab the scroll bar;
Jim Blandy <jimb@redhat.com>
parents:
2923
diff
changeset
|
5367 #if 0 |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5368 /* If the user has just clicked on the handle, record where they're |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5369 holding it. */ |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5370 if (event->type == ButtonPress |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5371 && emacs_event->part == scroll_bar_handle) |
|
9338
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
5372 XSETINT (bar->dragging, y - XINT (bar->start)); |
|
2953
5440f00480e6
* xterm.c (x_scroll_bar_handle_click): Never grab the scroll bar;
Jim Blandy <jimb@redhat.com>
parents:
2923
diff
changeset
|
5373 #endif |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5374 |
|
50064
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
5375 #ifndef USE_TOOLKIT_SCROLL_BARS |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5376 /* If the user has released the handle, set it to its final position. */ |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5377 if (event->type == ButtonRelease |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5378 && ! NILP (bar->dragging)) |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5379 { |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5380 int new_start = y - XINT (bar->dragging); |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5381 int new_end = new_start + (XINT (bar->end) - XINT (bar->start)); |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5382 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5383 x_scroll_bar_set_handle (bar, new_start, new_end, 0); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5384 bar->dragging = Qnil; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5385 } |
|
50064
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
5386 #endif |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5387 |
|
2958
3124e6244d1a
* xterm.c (x_scroll_bar_handle_click): Never grab the scroll bar;
Jim Blandy <jimb@redhat.com>
parents:
2953
diff
changeset
|
5388 /* Same deal here as the other #if 0. */ |
|
3124e6244d1a
* xterm.c (x_scroll_bar_handle_click): Never grab the scroll bar;
Jim Blandy <jimb@redhat.com>
parents:
2953
diff
changeset
|
5389 #if 0 |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
5390 /* Clicks on the handle are always reported as occurring at the top of |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5391 the handle. */ |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5392 if (emacs_event->part == scroll_bar_handle) |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5393 emacs_event->x = bar->start; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5394 else |
|
9338
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
5395 XSETINT (emacs_event->x, y); |
|
2958
3124e6244d1a
* xterm.c (x_scroll_bar_handle_click): Never grab the scroll bar;
Jim Blandy <jimb@redhat.com>
parents:
2953
diff
changeset
|
5396 #else |
|
9338
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
5397 XSETINT (emacs_event->x, y); |
|
2958
3124e6244d1a
* xterm.c (x_scroll_bar_handle_click): Never grab the scroll bar;
Jim Blandy <jimb@redhat.com>
parents:
2953
diff
changeset
|
5398 #endif |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5399 |
|
9338
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
5400 XSETINT (emacs_event->y, top_range); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5401 } |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5402 } |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5403 |
|
50064
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
5404 #ifndef USE_TOOLKIT_SCROLL_BARS |
|
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
5405 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5406 /* Handle some mouse motion while someone is dragging the scroll bar. |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5407 |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5408 This may be called from a signal handler, so we have to ignore GC |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5409 mark bits. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5410 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5411 static void |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5412 x_scroll_bar_note_movement (bar, event) |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5413 struct scroll_bar *bar; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5414 XEvent *event; |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5415 { |
|
12530
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
5416 FRAME_PTR f = XFRAME (XWINDOW (bar->window)->frame); |
|
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
5417 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5418 last_mouse_movement_time = event->xmotion.time; |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5419 |
|
12530
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
5420 f->mouse_moved = 1; |
|
9338
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
5421 XSETVECTOR (last_mouse_scroll_bar, bar); |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5422 |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5423 /* If we're dragging the bar, display it. */ |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5424 if (! GC_NILP (bar->dragging)) |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5425 { |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5426 /* Where should the handle be now? */ |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5427 int new_start = event->xmotion.y - XINT (bar->dragging); |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5428 |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5429 if (new_start != XINT (bar->start)) |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5430 { |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5431 int new_end = new_start + (XINT (bar->end) - XINT (bar->start)); |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
5432 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5433 x_scroll_bar_set_handle (bar, new_start, new_end, 0); |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5434 } |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5435 } |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5436 } |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5437 |
|
25716
e2d5cd96727b
(x_scroll_bar_handle_click): Compile only if
Gerd Moellmann <gerd@gnu.org>
parents:
25692
diff
changeset
|
5438 #endif /* !USE_TOOLKIT_SCROLL_BARS */ |
|
e2d5cd96727b
(x_scroll_bar_handle_click): Compile only if
Gerd Moellmann <gerd@gnu.org>
parents:
25692
diff
changeset
|
5439 |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5440 /* Return information to the user about the current position of the mouse |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5441 on the scroll bar. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5442 |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5443 static void |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
5444 x_scroll_bar_report_motion (fp, bar_window, part, x, y, time) |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
5445 FRAME_PTR *fp; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5446 Lisp_Object *bar_window; |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5447 enum scroll_bar_part *part; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5448 Lisp_Object *x, *y; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5449 unsigned long *time; |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5450 { |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5451 struct scroll_bar *bar = XSCROLL_BAR (last_mouse_scroll_bar); |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
5452 Window w = SCROLL_BAR_X_WINDOW (bar); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
5453 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5454 int win_x, win_y; |
|
2982
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5455 Window dummy_window; |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5456 int dummy_coord; |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5457 unsigned int dummy_mask; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5458 |
|
1803
5752a95053f2
* xterm.c (x_window_to_scrollbar): Search frames'
Jim Blandy <jimb@redhat.com>
parents:
1793
diff
changeset
|
5459 BLOCK_INPUT; |
|
5752a95053f2
* xterm.c (x_window_to_scrollbar): Search frames'
Jim Blandy <jimb@redhat.com>
parents:
1793
diff
changeset
|
5460 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5461 /* Get the mouse's position relative to the scroll bar window, and |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5462 report that. */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
5463 if (! XQueryPointer (FRAME_X_DISPLAY (f), w, |
|
2982
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5464 |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5465 /* Root, child, root x and root y. */ |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5466 &dummy_window, &dummy_window, |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5467 &dummy_coord, &dummy_coord, |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5468 |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5469 /* Position relative to scroll bar. */ |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5470 &win_x, &win_y, |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5471 |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5472 /* Mouse buttons and modifier keys. */ |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5473 &dummy_mask)) |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
5474 ; |
|
2982
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5475 else |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5476 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5477 #if 0 |
|
2982
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5478 int inside_height |
|
16251
ec1b1ae37295
Pass frame arg in calls to VERTICAL_SCROLL_BAR_INSIDE_HEIGHT
Richard M. Stallman <rms@gnu.org>
parents:
16220
diff
changeset
|
5479 = VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (f, XINT (bar->height)); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5480 #endif |
|
2982
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5481 int top_range |
|
16251
ec1b1ae37295
Pass frame arg in calls to VERTICAL_SCROLL_BAR_INSIDE_HEIGHT
Richard M. Stallman <rms@gnu.org>
parents:
16220
diff
changeset
|
5482 = VERTICAL_SCROLL_BAR_TOP_RANGE (f, XINT (bar->height)); |
|
2982
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5483 |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5484 win_y -= VERTICAL_SCROLL_BAR_TOP_BORDER; |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5485 |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5486 if (! NILP (bar->dragging)) |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5487 win_y -= XINT (bar->dragging); |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5488 |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5489 if (win_y < 0) |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5490 win_y = 0; |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5491 if (win_y > top_range) |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5492 win_y = top_range; |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5493 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
5494 *fp = f; |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
5495 *bar_window = bar->window; |
|
2982
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5496 |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5497 if (! NILP (bar->dragging)) |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5498 *part = scroll_bar_handle; |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5499 else if (win_y < XINT (bar->start)) |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5500 *part = scroll_bar_above_handle; |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5501 else if (win_y < XINT (bar->end) + VERTICAL_SCROLL_BAR_MIN_HANDLE) |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5502 *part = scroll_bar_handle; |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5503 else |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5504 *part = scroll_bar_below_handle; |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5505 |
|
9338
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
5506 XSETINT (*x, win_y); |
|
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
5507 XSETINT (*y, top_range); |
|
2982
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5508 |
|
12530
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
5509 f->mouse_moved = 0; |
|
2982
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5510 last_mouse_scroll_bar = Qnil; |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5511 } |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5512 |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5513 *time = last_mouse_movement_time; |
|
44ed08628516
* xterm.c (x_scroll_bar_report_motion): Set *TIME whether or not
Jim Blandy <jimb@redhat.com>
parents:
2977
diff
changeset
|
5514 |
|
1803
5752a95053f2
* xterm.c (x_window_to_scrollbar): Search frames'
Jim Blandy <jimb@redhat.com>
parents:
1793
diff
changeset
|
5515 UNBLOCK_INPUT; |
|
1787
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5516 } |
|
5e245540d06f
Make scrollbar structures into lisp objects, so that they can be
Jim Blandy <jimb@redhat.com>
parents:
1739
diff
changeset
|
5517 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5518 |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
5519 /* The screen has been cleared so we may have changed foreground or |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5520 background colors, and the scroll bars may need to be redrawn. |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5521 Clear out the scroll bars, and ask for expose events, so we can |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
5522 redraw them. */ |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
5523 |
| 21514 | 5524 void |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
5525 x_scroll_bar_clear (f) |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
5526 FRAME_PTR f; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
5527 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5528 #ifndef USE_TOOLKIT_SCROLL_BARS |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
5529 Lisp_Object bar; |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
5530 |
|
15080
50f527612ef6
(x_scroll_bar_clear): Do nothing if frame now has no scroll bars.
Richard M. Stallman <rms@gnu.org>
parents:
15067
diff
changeset
|
5531 /* We can have scroll bars even if this is 0, |
|
50f527612ef6
(x_scroll_bar_clear): Do nothing if frame now has no scroll bars.
Richard M. Stallman <rms@gnu.org>
parents:
15067
diff
changeset
|
5532 if we just turned off scroll bar mode. |
|
50f527612ef6
(x_scroll_bar_clear): Do nothing if frame now has no scroll bars.
Richard M. Stallman <rms@gnu.org>
parents:
15067
diff
changeset
|
5533 But in that case we should not clear them. */ |
|
50f527612ef6
(x_scroll_bar_clear): Do nothing if frame now has no scroll bars.
Richard M. Stallman <rms@gnu.org>
parents:
15067
diff
changeset
|
5534 if (FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
|
50f527612ef6
(x_scroll_bar_clear): Do nothing if frame now has no scroll bars.
Richard M. Stallman <rms@gnu.org>
parents:
15067
diff
changeset
|
5535 for (bar = FRAME_SCROLL_BARS (f); VECTORP (bar); |
|
50f527612ef6
(x_scroll_bar_clear): Do nothing if frame now has no scroll bars.
Richard M. Stallman <rms@gnu.org>
parents:
15067
diff
changeset
|
5536 bar = XSCROLL_BAR (bar)->next) |
|
35581
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
5537 XClearArea (FRAME_X_DISPLAY (f), |
|
3a46a6389078
(x_after_update_window_line): Don't clear if frame's
Gerd Moellmann <gerd@gnu.org>
parents:
35568
diff
changeset
|
5538 SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar)), |
|
15080
50f527612ef6
(x_scroll_bar_clear): Do nothing if frame now has no scroll bars.
Richard M. Stallman <rms@gnu.org>
parents:
15067
diff
changeset
|
5539 0, 0, 0, 0, True); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5540 #endif /* not USE_TOOLKIT_SCROLL_BARS */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5541 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5542 |
|
8353
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5543 |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5544 /* Define a queue to save up SelectionRequest events for later handling. */ |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5545 |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5546 struct selection_event_queue |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5547 { |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5548 XEvent event; |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5549 struct selection_event_queue *next; |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5550 }; |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5551 |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5552 static struct selection_event_queue *queue; |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5553 |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5554 /* Nonzero means queue up certain events--don't process them yet. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5555 |
|
8353
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5556 static int x_queue_selection_requests; |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5557 |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5558 /* Queue up an X event *EVENT, to be processed later. */ |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5559 |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5560 static void |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
5561 x_queue_event (f, event) |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
5562 FRAME_PTR f; |
|
8353
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5563 XEvent *event; |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5564 { |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5565 struct selection_event_queue *queue_tmp |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5566 = (struct selection_event_queue *) xmalloc (sizeof (struct selection_event_queue)); |
|
8353
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5567 |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
5568 if (queue_tmp != NULL) |
|
8353
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5569 { |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5570 queue_tmp->event = *event; |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5571 queue_tmp->next = queue; |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5572 queue = queue_tmp; |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5573 } |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5574 } |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5575 |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5576 /* Take all the queued events and put them back |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5577 so that they get processed afresh. */ |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5578 |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5579 static void |
|
10634
de7beeb9f02c
(x_unqueue_events): Arg is now a Display *.
Richard M. Stallman <rms@gnu.org>
parents:
10609
diff
changeset
|
5580 x_unqueue_events (display) |
|
de7beeb9f02c
(x_unqueue_events): Arg is now a Display *.
Richard M. Stallman <rms@gnu.org>
parents:
10609
diff
changeset
|
5581 Display *display; |
|
8353
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5582 { |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
5583 while (queue != NULL) |
|
8353
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5584 { |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5585 struct selection_event_queue *queue_tmp = queue; |
|
10634
de7beeb9f02c
(x_unqueue_events): Arg is now a Display *.
Richard M. Stallman <rms@gnu.org>
parents:
10609
diff
changeset
|
5586 XPutBackEvent (display, &queue_tmp->event); |
|
8353
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5587 queue = queue_tmp->next; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5588 xfree ((char *)queue_tmp); |
|
8353
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5589 } |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5590 } |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5591 |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5592 /* Start queuing SelectionRequest events. */ |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5593 |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5594 void |
|
10634
de7beeb9f02c
(x_unqueue_events): Arg is now a Display *.
Richard M. Stallman <rms@gnu.org>
parents:
10609
diff
changeset
|
5595 x_start_queuing_selection_requests (display) |
|
de7beeb9f02c
(x_unqueue_events): Arg is now a Display *.
Richard M. Stallman <rms@gnu.org>
parents:
10609
diff
changeset
|
5596 Display *display; |
|
8353
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5597 { |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5598 x_queue_selection_requests++; |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5599 } |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5600 |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5601 /* Stop queuing SelectionRequest events. */ |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5602 |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5603 void |
|
10634
de7beeb9f02c
(x_unqueue_events): Arg is now a Display *.
Richard M. Stallman <rms@gnu.org>
parents:
10609
diff
changeset
|
5604 x_stop_queuing_selection_requests (display) |
|
de7beeb9f02c
(x_unqueue_events): Arg is now a Display *.
Richard M. Stallman <rms@gnu.org>
parents:
10609
diff
changeset
|
5605 Display *display; |
|
8353
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5606 { |
|
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5607 x_queue_selection_requests--; |
|
10634
de7beeb9f02c
(x_unqueue_events): Arg is now a Display *.
Richard M. Stallman <rms@gnu.org>
parents:
10609
diff
changeset
|
5608 x_unqueue_events (display); |
|
8353
525e990ca9d2
(x_queue_event, x_unqueue_events): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
8291
diff
changeset
|
5609 } |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5610 |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
5611 /* The main X event-reading loop - XTread_socket. */ |
| 286 | 5612 |
|
43479
4cedb4e5510e
(enter_timestamp): Put in #if 0 to prevent warning.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43369
diff
changeset
|
5613 #if 0 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5614 /* Time stamp of enter window event. This is only used by XTread_socket, |
| 286 | 5615 but we have to put it out here, since static variables within functions |
| 5616 sometimes don't work. */ | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5617 |
| 286 | 5618 static Time enter_timestamp; |
|
43479
4cedb4e5510e
(enter_timestamp): Put in #if 0 to prevent warning.
Pavel Jan?k <Pavel@Janik.cz>
parents:
43369
diff
changeset
|
5619 #endif |
| 286 | 5620 |
|
1436
e7c5faab6571
* xterm.c (compose_status): New variable.
Jim Blandy <jimb@redhat.com>
parents:
1389
diff
changeset
|
5621 /* This holds the state XLookupString needs to implement dead keys |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
5622 and other tricks known as "compose processing". _X Window System_ |
|
1436
e7c5faab6571
* xterm.c (compose_status): New variable.
Jim Blandy <jimb@redhat.com>
parents:
1389
diff
changeset
|
5623 says that a portable program can't use this, but Stephen Gildea assures |
|
e7c5faab6571
* xterm.c (compose_status): New variable.
Jim Blandy <jimb@redhat.com>
parents:
1389
diff
changeset
|
5624 me that letting the compiler initialize it to zeros will work okay. |
|
e7c5faab6571
* xterm.c (compose_status): New variable.
Jim Blandy <jimb@redhat.com>
parents:
1389
diff
changeset
|
5625 |
|
e7c5faab6571
* xterm.c (compose_status): New variable.
Jim Blandy <jimb@redhat.com>
parents:
1389
diff
changeset
|
5626 This must be defined outside of XTread_socket, for the same reasons |
| 41446 | 5627 given for enter_timestamp, above. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5628 |
|
1436
e7c5faab6571
* xterm.c (compose_status): New variable.
Jim Blandy <jimb@redhat.com>
parents:
1389
diff
changeset
|
5629 static XComposeStatus compose_status; |
|
e7c5faab6571
* xterm.c (compose_status): New variable.
Jim Blandy <jimb@redhat.com>
parents:
1389
diff
changeset
|
5630 |
| 2064 | 5631 /* Record the last 100 characters stored |
| 5632 to help debug the loss-of-chars-during-GC problem. */ | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5633 |
|
12657
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
5634 static int temp_index; |
|
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
5635 static short temp_buffer[100]; |
| 2064 | 5636 |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5637 #define STORE_KEYSYM_FOR_DEBUG(keysym) \ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5638 if (temp_index == sizeof temp_buffer / sizeof (short)) \ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5639 temp_index = 0; \ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5640 temp_buffer[temp_index++] = (keysym) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5641 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
5642 /* Set this to nonzero to fake an "X I/O error" |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
5643 on a particular display. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5644 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
5645 struct x_display_info *XTread_socket_fake_io_error; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
5646 |
|
12657
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
5647 /* When we find no input here, we occasionally do a no-op command |
|
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
5648 to verify that the X server is still running and we can still talk with it. |
|
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
5649 We try all the open displays, one by one. |
|
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
5650 This variable is used for cycling thru the displays. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5651 |
|
12657
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
5652 static struct x_display_info *next_noop_dpyinfo; |
|
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
5653 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5654 #define SET_SAVED_MENU_EVENT(size) \ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5655 do \ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5656 { \ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5657 if (f->output_data.x->saved_menu_event == 0) \ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5658 f->output_data.x->saved_menu_event \ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5659 = (XEvent *) xmalloc (sizeof (XEvent)); \ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5660 bcopy (&event, f->output_data.x->saved_menu_event, size); \ |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5661 inev.kind = MENU_BAR_ACTIVATE_EVENT; \ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5662 XSETFRAME (inev.frame_or_window, f); \ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5663 } \ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5664 while (0) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5665 |
|
15711
099dc465c948
(SET_SAVED_MENU_EVENT): New macro.
Karl Heuer <kwzh@gnu.org>
parents:
15639
diff
changeset
|
5666 #define SET_SAVED_BUTTON_EVENT SET_SAVED_MENU_EVENT (sizeof (XButtonEvent)) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
5667 #define SET_SAVED_KEY_EVENT SET_SAVED_MENU_EVENT (sizeof (XKeyEvent)) |
|
15711
099dc465c948
(SET_SAVED_MENU_EVENT): New macro.
Karl Heuer <kwzh@gnu.org>
parents:
15639
diff
changeset
|
5668 |
| 49117 | 5669 |
| 5670 enum | |
| 5671 { | |
| 5672 X_EVENT_NORMAL, | |
| 5673 X_EVENT_GOTO_OUT, | |
| 5674 X_EVENT_DROP | |
| 5675 }; | |
| 5676 | |
|
49434
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5677 /* Filter events for the current X input method. |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5678 DPYINFO is the display this event is for. |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5679 EVENT is the X event to filter. |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5680 |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5681 Returns non-zero if the event was filtered, caller shall not process |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5682 this event further. |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5683 Returns zero if event is wasn't filtered. */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
5684 |
|
49434
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5685 #ifdef HAVE_X_I18N |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5686 static int |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5687 x_filter_event (dpyinfo, event) |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5688 struct x_display_info *dpyinfo; |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5689 XEvent *event; |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5690 { |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5691 /* XFilterEvent returns non-zero if the input method has |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5692 consumed the event. We pass the frame's X window to |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5693 XFilterEvent because that's the one for which the IC |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5694 was created. */ |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5695 |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5696 struct frame *f1 = x_any_window_to_frame (dpyinfo, |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5697 event->xclient.window); |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5698 |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5699 return XFilterEvent (event, f1 ? FRAME_X_WINDOW (f1) : None); |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5700 } |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5701 #endif |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5702 |
| 49322 | 5703 #ifdef USE_GTK |
| 5704 static int current_count; | |
| 5705 static int current_finish; | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5706 static struct input_event *current_hold_quit; |
| 49322 | 5707 |
| 5708 /* This is the filter function invoked by the GTK event loop. | |
| 5709 It is invoked before the XEvent is translated to a GdkEvent, | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5710 so we have a chance to act on the event before GTK. */ |
| 49322 | 5711 static GdkFilterReturn |
| 5712 event_handler_gdk (gxev, ev, data) | |
| 5713 GdkXEvent *gxev; | |
| 5714 GdkEvent *ev; | |
| 5715 gpointer data; | |
| 5716 { | |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
5717 XEvent *xev = (XEvent *) gxev; |
| 49322 | 5718 |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5719 if (current_count >= 0) |
|
49434
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5720 { |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
5721 struct x_display_info *dpyinfo; |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
5722 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
5723 dpyinfo = x_display_info_for_display (xev->xany.display); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
5724 |
|
49434
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5725 #ifdef HAVE_X_I18N |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5726 /* Filter events for the current X input method. |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5727 GTK calls XFilterEvent but not for key press and release, |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5728 so we do it here. */ |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5729 if (xev->type == KeyPress || xev->type == KeyRelease) |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
5730 if (dpyinfo && x_filter_event (dpyinfo, xev)) |
|
49434
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5731 return GDK_FILTER_REMOVE; |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5732 #endif |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
5733 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
5734 if (! dpyinfo) |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
5735 current_finish = X_EVENT_NORMAL; |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
5736 else |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5737 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5738 current_count += |
|
54650
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
5739 handle_one_xevent (dpyinfo, xev, ¤t_finish, |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5740 current_hold_quit); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5741 } |
|
49434
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5742 } |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
5743 else |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
5744 current_finish = x_dispatch_event (xev, xev->xany.display); |
| 49322 | 5745 |
| 5746 if (current_finish == X_EVENT_GOTO_OUT || current_finish == X_EVENT_DROP) | |
| 5747 return GDK_FILTER_REMOVE; | |
| 5748 | |
| 5749 return GDK_FILTER_CONTINUE; | |
| 5750 } | |
| 5751 #endif /* USE_GTK */ | |
| 5752 | |
| 5753 | |
| 49117 | 5754 /* Handles the XEvent EVENT on display DPYINFO. |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
5755 |
| 49117 | 5756 *FINISH is X_EVENT_GOTO_OUT if caller should stop reading events. |
| 5757 *FINISH is zero if caller should continue reading events. | |
| 5758 *FINISH is X_EVENT_DROP if event should not be passed to the toolkit. | |
| 5759 | |
| 5760 We return the number of characters stored into the buffer. */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
5761 |
| 49117 | 5762 static int |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5763 handle_one_xevent (dpyinfo, eventp, finish, hold_quit) |
| 49117 | 5764 struct x_display_info *dpyinfo; |
| 5765 XEvent *eventp; | |
| 5766 int *finish; | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5767 struct input_event *hold_quit; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5768 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5769 struct input_event inev; |
| 49117 | 5770 int count = 0; |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5771 int do_help = 0; |
| 49117 | 5772 int nbytes = 0; |
| 5773 struct frame *f; | |
| 5774 struct coding_system coding; | |
| 5775 XEvent event = *eventp; | |
| 5776 | |
| 5777 *finish = X_EVENT_NORMAL; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
5778 |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5779 EVENT_INIT (inev); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5780 inev.kind = NO_EVENT; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5781 inev.arg = Qnil; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5782 |
| 49117 | 5783 switch (event.type) |
| 5784 { | |
| 5785 case ClientMessage: | |
| 5786 { | |
| 5787 if (event.xclient.message_type | |
| 5788 == dpyinfo->Xatom_wm_protocols | |
| 5789 && event.xclient.format == 32) | |
| 5790 { | |
| 5791 if (event.xclient.data.l[0] | |
| 5792 == dpyinfo->Xatom_wm_take_focus) | |
| 5793 { | |
| 5794 /* Use x_any_window_to_frame because this | |
| 5795 could be the shell widget window | |
| 5796 if the frame has no title bar. */ | |
| 5797 f = x_any_window_to_frame (dpyinfo, event.xclient.window); | |
| 5798 #ifdef HAVE_X_I18N | |
| 5799 /* Not quite sure this is needed -pd */ | |
| 5800 if (f && FRAME_XIC (f)) | |
| 5801 XSetICFocus (FRAME_XIC (f)); | |
| 5802 #endif | |
| 5803 #if 0 /* Emacs sets WM hints whose `input' field is `true'. This | |
| 5804 instructs the WM to set the input focus automatically for | |
| 5805 Emacs with a call to XSetInputFocus. Setting WM_TAKE_FOCUS | |
| 5806 tells the WM to send us a ClientMessage WM_TAKE_FOCUS after | |
| 5807 it has set the focus. So, XSetInputFocus below is not | |
| 5808 needed. | |
| 5809 | |
| 5810 The call to XSetInputFocus below has also caused trouble. In | |
| 5811 cases where the XSetInputFocus done by the WM and the one | |
| 5812 below are temporally close (on a fast machine), the call | |
| 5813 below can generate additional FocusIn events which confuse | |
| 5814 Emacs. */ | |
| 5815 | |
| 5816 /* Since we set WM_TAKE_FOCUS, we must call | |
| 5817 XSetInputFocus explicitly. But not if f is null, | |
| 5818 since that might be an event for a deleted frame. */ | |
| 5819 if (f) | |
| 5820 { | |
| 5821 Display *d = event.xclient.display; | |
| 5822 /* Catch and ignore errors, in case window has been | |
| 5823 iconified by a window manager such as GWM. */ | |
| 5824 int count = x_catch_errors (d); | |
| 5825 XSetInputFocus (d, event.xclient.window, | |
| 5826 /* The ICCCM says this is | |
| 5827 the only valid choice. */ | |
| 5828 RevertToParent, | |
| 5829 event.xclient.data.l[1]); | |
| 5830 /* This is needed to detect the error | |
| 5831 if there is an error. */ | |
| 5832 XSync (d, False); | |
| 5833 x_uncatch_errors (d, count); | |
| 5834 } | |
| 5835 /* Not certain about handling scroll bars here */ | |
| 5836 #endif /* 0 */ | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5837 goto done; |
| 49117 | 5838 } |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5839 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5840 if (event.xclient.data.l[0] |
| 49117 | 5841 == dpyinfo->Xatom_wm_save_yourself) |
| 5842 { | |
| 5843 /* Save state modify the WM_COMMAND property to | |
| 5844 something which can reinstate us. This notifies | |
| 5845 the session manager, who's looking for such a | |
| 5846 PropertyNotify. Can restart processing when | |
| 5847 a keyboard or mouse event arrives. */ | |
| 5848 /* If we have a session manager, don't set this. | |
| 5849 KDE will then start two Emacsen, one for the | |
| 5850 session manager and one for this. */ | |
| 5851 #ifdef HAVE_X_SM | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5852 if (! x_session_have_connection ()) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5853 #endif |
| 49117 | 5854 { |
| 5855 f = x_top_window_to_frame (dpyinfo, | |
| 5856 event.xclient.window); | |
| 5857 /* This is just so we only give real data once | |
| 5858 for a single Emacs process. */ | |
| 5859 if (f == SELECTED_FRAME ()) | |
| 5860 XSetCommand (FRAME_X_DISPLAY (f), | |
| 5861 event.xclient.window, | |
| 5862 initial_argv, initial_argc); | |
| 5863 else if (f) | |
| 5864 XSetCommand (FRAME_X_DISPLAY (f), | |
| 5865 event.xclient.window, | |
| 5866 0, 0); | |
| 5867 } | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5868 goto done; |
| 49117 | 5869 } |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5870 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5871 if (event.xclient.data.l[0] |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5872 == dpyinfo->Xatom_wm_delete_window) |
| 49117 | 5873 { |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5874 f = x_any_window_to_frame (dpyinfo, |
| 49117 | 5875 event.xclient.window); |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5876 if (!f) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5877 goto OTHER; /* May be a dialog that is to be removed */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5878 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5879 inev.kind = DELETE_WINDOW_EVENT; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5880 XSETFRAME (inev.frame_or_window, f); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5881 goto done; |
| 49117 | 5882 } |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5883 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5884 goto done; |
| 49117 | 5885 } |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5886 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5887 if (event.xclient.message_type |
| 49117 | 5888 == dpyinfo->Xatom_wm_configure_denied) |
| 5889 { | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5890 goto done; |
| 49117 | 5891 } |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5892 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5893 if (event.xclient.message_type |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5894 == dpyinfo->Xatom_wm_window_moved) |
| 49117 | 5895 { |
| 5896 int new_x, new_y; | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5897 f = x_window_to_frame (dpyinfo, event.xclient.window); |
| 49117 | 5898 |
| 5899 new_x = event.xclient.data.s[0]; | |
| 5900 new_y = event.xclient.data.s[1]; | |
| 5901 | |
| 5902 if (f) | |
| 5903 { | |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
5904 f->left_pos = new_x; |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
5905 f->top_pos = new_y; |
| 49117 | 5906 } |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5907 goto done; |
| 49117 | 5908 } |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5909 |
| 49117 | 5910 #ifdef HACK_EDITRES |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5911 if (event.xclient.message_type |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5912 == dpyinfo->Xatom_editres) |
| 49117 | 5913 { |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5914 f = x_any_window_to_frame (dpyinfo, event.xclient.window); |
| 49117 | 5915 _XEditResCheckMessages (f->output_data.x->widget, NULL, |
| 5916 &event, NULL); | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5917 goto done; |
| 49117 | 5918 } |
| 5919 #endif /* HACK_EDITRES */ | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5920 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5921 if ((event.xclient.message_type |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5922 == dpyinfo->Xatom_DONE) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5923 || (event.xclient.message_type |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5924 == dpyinfo->Xatom_PAGE)) |
| 49117 | 5925 { |
| 5926 /* Ghostview job completed. Kill it. We could | |
| 5927 reply with "Next" if we received "Page", but we | |
| 5928 currently never do because we are interested in | |
| 5929 images, only, which should have 1 page. */ | |
| 5930 Pixmap pixmap = (Pixmap) event.xclient.data.l[1]; | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5931 f = x_window_to_frame (dpyinfo, event.xclient.window); |
| 49117 | 5932 x_kill_gs_process (pixmap, f); |
| 5933 expose_frame (f, 0, 0, 0, 0); | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5934 goto done; |
| 49117 | 5935 } |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5936 |
| 49117 | 5937 #ifdef USE_TOOLKIT_SCROLL_BARS |
| 5938 /* Scroll bar callbacks send a ClientMessage from which | |
| 5939 we construct an input_event. */ | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5940 if (event.xclient.message_type |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5941 == dpyinfo->Xatom_Scrollbar) |
| 49117 | 5942 { |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5943 x_scroll_bar_to_input_event (&event, &inev); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5944 *finish = X_EVENT_GOTO_OUT; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5945 goto done; |
| 49117 | 5946 } |
| 5947 #endif /* USE_TOOLKIT_SCROLL_BARS */ | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5948 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5949 f = x_any_window_to_frame (dpyinfo, event.xclient.window); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5950 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5951 if (!f) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5952 goto OTHER; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5953 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5954 if (x_handle_dnd_message (f, &event.xclient, dpyinfo, &inev)) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5955 *finish = X_EVENT_DROP; |
| 49117 | 5956 } |
| 5957 break; | |
| 5958 | |
| 5959 case SelectionNotify: | |
| 5960 #ifdef USE_X_TOOLKIT | |
| 5961 if (! x_window_to_frame (dpyinfo, event.xselection.requestor)) | |
| 5962 goto OTHER; | |
| 5963 #endif /* not USE_X_TOOLKIT */ | |
| 5964 x_handle_selection_notify (&event.xselection); | |
| 5965 break; | |
| 5966 | |
| 5967 case SelectionClear: /* Someone has grabbed ownership. */ | |
| 5968 #ifdef USE_X_TOOLKIT | |
| 5969 if (! x_window_to_frame (dpyinfo, event.xselectionclear.window)) | |
| 5970 goto OTHER; | |
| 5971 #endif /* USE_X_TOOLKIT */ | |
| 5972 { | |
| 5973 XSelectionClearEvent *eventp = (XSelectionClearEvent *) &event; | |
| 5974 | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5975 inev.kind = SELECTION_CLEAR_EVENT; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5976 SELECTION_EVENT_DISPLAY (&inev) = eventp->display; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5977 SELECTION_EVENT_SELECTION (&inev) = eventp->selection; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5978 SELECTION_EVENT_TIME (&inev) = eventp->time; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5979 inev.frame_or_window = Qnil; |
| 49117 | 5980 } |
| 5981 break; | |
| 5982 | |
| 5983 case SelectionRequest: /* Someone wants our selection. */ | |
| 5984 #ifdef USE_X_TOOLKIT | |
| 5985 if (!x_window_to_frame (dpyinfo, event.xselectionrequest.owner)) | |
| 5986 goto OTHER; | |
| 5987 #endif /* USE_X_TOOLKIT */ | |
| 5988 if (x_queue_selection_requests) | |
| 5989 x_queue_event (x_window_to_frame (dpyinfo, event.xselectionrequest.owner), | |
| 5990 &event); | |
| 5991 else | |
| 5992 { | |
| 5993 XSelectionRequestEvent *eventp | |
| 5994 = (XSelectionRequestEvent *) &event; | |
| 5995 | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5996 inev.kind = SELECTION_REQUEST_EVENT; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5997 SELECTION_EVENT_DISPLAY (&inev) = eventp->display; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5998 SELECTION_EVENT_REQUESTOR (&inev) = eventp->requestor; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
5999 SELECTION_EVENT_SELECTION (&inev) = eventp->selection; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6000 SELECTION_EVENT_TARGET (&inev) = eventp->target; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6001 SELECTION_EVENT_PROPERTY (&inev) = eventp->property; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6002 SELECTION_EVENT_TIME (&inev) = eventp->time; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6003 inev.frame_or_window = Qnil; |
| 49117 | 6004 } |
| 6005 break; | |
| 6006 | |
| 6007 case PropertyNotify: | |
| 6008 #if 0 /* This is plain wrong. In the case that we are waiting for a | |
| 6009 PropertyNotify used as an ACK in incremental selection | |
| 6010 transfer, the property will be on the receiver's window. */ | |
| 6011 #if defined USE_X_TOOLKIT | |
| 6012 if (!x_any_window_to_frame (dpyinfo, event.xproperty.window)) | |
| 6013 goto OTHER; | |
| 6014 #endif | |
| 6015 #endif | |
| 6016 x_handle_property_notify (&event.xproperty); | |
| 6017 goto OTHER; | |
| 6018 | |
| 6019 case ReparentNotify: | |
| 6020 f = x_top_window_to_frame (dpyinfo, event.xreparent.window); | |
| 6021 if (f) | |
| 6022 { | |
| 6023 int x, y; | |
| 6024 f->output_data.x->parent_desc = event.xreparent.parent; | |
| 6025 x_real_positions (f, &x, &y); | |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6026 f->left_pos = x; |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6027 f->top_pos = y; |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
6028 |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
6029 /* Perhaps reparented due to a WM restart. Reset this. */ |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
6030 FRAME_X_DISPLAY_INFO (f)->wm_type = X_WMTYPE_UNKNOWN; |
| 49117 | 6031 } |
|
50056
7933b5de384c
* xterm.c (handle_one_xevent): Pass ReparentNotify to Xt even if
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50021
diff
changeset
|
6032 goto OTHER; |
| 49117 | 6033 |
| 6034 case Expose: | |
| 6035 f = x_window_to_frame (dpyinfo, event.xexpose.window); | |
| 6036 if (f) | |
| 6037 { | |
| 6038 x_check_fullscreen (f); | |
| 6039 | |
| 6040 if (f->async_visible == 0) | |
| 6041 { | |
| 6042 f->async_visible = 1; | |
| 6043 f->async_iconified = 0; | |
| 6044 f->output_data.x->has_been_visible = 1; | |
| 6045 SET_FRAME_GARBAGED (f); | |
| 6046 } | |
| 6047 else | |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6048 expose_frame (f, |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6049 event.xexpose.x, event.xexpose.y, |
| 49117 | 6050 event.xexpose.width, event.xexpose.height); |
| 6051 } | |
| 6052 else | |
| 6053 { | |
| 6054 #ifndef USE_TOOLKIT_SCROLL_BARS | |
| 6055 struct scroll_bar *bar; | |
| 6056 #endif | |
| 6057 #if defined USE_LUCID | |
| 6058 /* Submenus of the Lucid menu bar aren't widgets | |
| 6059 themselves, so there's no way to dispatch events | |
| 6060 to them. Recognize this case separately. */ | |
| 6061 { | |
| 6062 Widget widget | |
| 6063 = x_window_to_menu_bar (event.xexpose.window); | |
| 6064 if (widget) | |
| 6065 xlwmenu_redisplay (widget); | |
| 6066 } | |
| 6067 #endif /* USE_LUCID */ | |
| 6068 | |
| 6069 #ifdef USE_TOOLKIT_SCROLL_BARS | |
| 6070 /* Dispatch event to the widget. */ | |
| 6071 goto OTHER; | |
| 6072 #else /* not USE_TOOLKIT_SCROLL_BARS */ | |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
6073 bar = x_window_to_scroll_bar (event.xexpose.display, |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
6074 event.xexpose.window); |
| 49117 | 6075 |
| 6076 if (bar) | |
| 6077 x_scroll_bar_expose (bar, &event); | |
| 6078 #ifdef USE_X_TOOLKIT | |
| 6079 else | |
| 6080 goto OTHER; | |
| 6081 #endif /* USE_X_TOOLKIT */ | |
| 6082 #endif /* not USE_TOOLKIT_SCROLL_BARS */ | |
| 6083 } | |
| 6084 break; | |
| 6085 | |
| 6086 case GraphicsExpose: /* This occurs when an XCopyArea's | |
| 6087 source area was obscured or not | |
| 6088 available. */ | |
| 6089 f = x_window_to_frame (dpyinfo, event.xgraphicsexpose.drawable); | |
| 6090 if (f) | |
| 6091 { | |
| 6092 expose_frame (f, | |
| 6093 event.xgraphicsexpose.x, event.xgraphicsexpose.y, | |
| 6094 event.xgraphicsexpose.width, | |
| 6095 event.xgraphicsexpose.height); | |
| 6096 } | |
| 6097 #ifdef USE_X_TOOLKIT | |
| 6098 else | |
| 6099 goto OTHER; | |
| 6100 #endif /* USE_X_TOOLKIT */ | |
| 6101 break; | |
| 6102 | |
| 6103 case NoExpose: /* This occurs when an XCopyArea's | |
| 6104 source area was completely | |
| 6105 available. */ | |
| 6106 break; | |
| 6107 | |
| 6108 case UnmapNotify: | |
| 6109 /* Redo the mouse-highlight after the tooltip has gone. */ | |
| 6110 if (event.xmap.window == tip_window) | |
| 6111 { | |
| 6112 tip_window = 0; | |
| 6113 redo_mouse_highlight (); | |
| 6114 } | |
| 6115 | |
| 6116 f = x_top_window_to_frame (dpyinfo, event.xunmap.window); | |
| 6117 if (f) /* F may no longer exist if | |
| 6118 the frame was deleted. */ | |
| 6119 { | |
| 6120 /* While a frame is unmapped, display generation is | |
| 6121 disabled; you don't want to spend time updating a | |
| 6122 display that won't ever be seen. */ | |
| 6123 f->async_visible = 0; | |
| 6124 /* We can't distinguish, from the event, whether the window | |
| 6125 has become iconified or invisible. So assume, if it | |
| 6126 was previously visible, than now it is iconified. | |
| 6127 But x_make_frame_invisible clears both | |
| 6128 the visible flag and the iconified flag; | |
| 6129 and that way, we know the window is not iconified now. */ | |
| 6130 if (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f)) | |
| 6131 { | |
| 6132 f->async_iconified = 1; | |
| 6133 | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6134 inev.kind = ICONIFY_EVENT; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6135 XSETFRAME (inev.frame_or_window, f); |
| 49117 | 6136 } |
| 6137 } | |
| 6138 goto OTHER; | |
| 6139 | |
| 6140 case MapNotify: | |
| 6141 if (event.xmap.window == tip_window) | |
| 6142 /* The tooltip has been drawn already. Avoid | |
| 6143 the SET_FRAME_GARBAGED below. */ | |
| 6144 goto OTHER; | |
| 6145 | |
| 6146 /* We use x_top_window_to_frame because map events can | |
| 6147 come for sub-windows and they don't mean that the | |
| 6148 frame is visible. */ | |
| 6149 f = x_top_window_to_frame (dpyinfo, event.xmap.window); | |
| 6150 if (f) | |
| 6151 { | |
| 6152 /* wait_reading_process_input will notice this and update | |
| 6153 the frame's display structures. | |
| 6154 If we where iconified, we should not set garbaged, | |
| 6155 because that stops redrawing on Expose events. This looks | |
| 6156 bad if we are called from a recursive event loop | |
| 6157 (x_dispatch_event), for example when a dialog is up. */ | |
| 6158 if (! f->async_iconified) | |
| 6159 SET_FRAME_GARBAGED (f); | |
| 6160 | |
| 6161 f->async_visible = 1; | |
| 6162 f->async_iconified = 0; | |
| 6163 f->output_data.x->has_been_visible = 1; | |
| 6164 | |
| 6165 if (f->iconified) | |
| 6166 { | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6167 inev.kind = DEICONIFY_EVENT; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6168 XSETFRAME (inev.frame_or_window, f); |
| 49117 | 6169 } |
| 6170 else if (! NILP (Vframe_list) | |
| 6171 && ! NILP (XCDR (Vframe_list))) | |
| 6172 /* Force a redisplay sooner or later | |
| 6173 to update the frame titles | |
| 6174 in case this is the second frame. */ | |
| 6175 record_asynch_buffer_change (); | |
| 6176 } | |
| 6177 goto OTHER; | |
| 6178 | |
| 6179 case KeyPress: | |
| 6180 | |
|
54650
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6181 ignore_next_mouse_click_timeout = 0; |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6182 |
| 49326 | 6183 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) |
| 49117 | 6184 /* Dispatch KeyPress events when in menu. */ |
| 49322 | 6185 if (popup_activated ()) |
| 49117 | 6186 goto OTHER; |
| 49326 | 6187 #endif |
| 49322 | 6188 |
| 49117 | 6189 f = x_any_window_to_frame (dpyinfo, event.xkey.window); |
| 6190 | |
| 6191 if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)) | |
| 6192 { | |
|
54733
edff9ce01ed0
(handle_one_xevent): Set mouse_face_hidden after clearing highlight.
Kim F. Storm <storm@cua.dk>
parents:
54651
diff
changeset
|
6193 clear_mouse_face (dpyinfo); |
| 49117 | 6194 dpyinfo->mouse_face_hidden = 1; |
| 6195 } | |
| 6196 | |
| 6197 #if defined USE_MOTIF && defined USE_TOOLKIT_SCROLL_BARS | |
| 6198 if (f == 0) | |
| 6199 { | |
| 6200 /* Scroll bars consume key events, but we want | |
| 6201 the keys to go to the scroll bar's frame. */ | |
| 6202 Widget widget = XtWindowToWidget (dpyinfo->display, | |
| 6203 event.xkey.window); | |
| 6204 if (widget && XmIsScrollBar (widget)) | |
| 6205 { | |
| 6206 widget = XtParent (widget); | |
| 6207 f = x_any_window_to_frame (dpyinfo, XtWindow (widget)); | |
| 6208 } | |
| 6209 } | |
| 6210 #endif /* USE_MOTIF and USE_TOOLKIT_SCROLL_BARS */ | |
| 6211 | |
| 6212 if (f != 0) | |
| 6213 { | |
| 6214 KeySym keysym, orig_keysym; | |
| 6215 /* al%imercury@uunet.uu.net says that making this 81 | |
| 6216 instead of 80 fixed a bug whereby meta chars made | |
| 6217 his Emacs hang. | |
| 6218 | |
| 6219 It seems that some version of XmbLookupString has | |
| 6220 a bug of not returning XBufferOverflow in | |
| 6221 status_return even if the input is too long to | |
| 6222 fit in 81 bytes. So, we must prepare sufficient | |
| 6223 bytes for copy_buffer. 513 bytes (256 chars for | |
| 6224 two-byte character set) seems to be a fairly good | |
| 6225 approximation. -- 2000.8.10 handa@etl.go.jp */ | |
| 6226 unsigned char copy_buffer[513]; | |
| 6227 unsigned char *copy_bufptr = copy_buffer; | |
| 6228 int copy_bufsiz = sizeof (copy_buffer); | |
| 6229 int modifiers; | |
| 6230 Lisp_Object coding_system = Qlatin_1; | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6231 Lisp_Object c; |
| 49117 | 6232 |
|
54451
66000dbe48c9
* xterm.c (handle_one_xevent): Do not pass key press events to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54185
diff
changeset
|
6233 #ifdef USE_GTK |
|
66000dbe48c9
* xterm.c (handle_one_xevent): Do not pass key press events to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54185
diff
changeset
|
6234 /* Don't pass keys to GTK. A Tab will shift focus to the |
|
66000dbe48c9
* xterm.c (handle_one_xevent): Do not pass key press events to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54185
diff
changeset
|
6235 tool bar in GTK 2.4. Keys will still go to menus and |
|
66000dbe48c9
* xterm.c (handle_one_xevent): Do not pass key press events to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54185
diff
changeset
|
6236 dialogs because in that case popup_activated is TRUE |
|
66000dbe48c9
* xterm.c (handle_one_xevent): Do not pass key press events to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54185
diff
changeset
|
6237 (see above). */ |
|
66000dbe48c9
* xterm.c (handle_one_xevent): Do not pass key press events to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54185
diff
changeset
|
6238 *finish = X_EVENT_DROP; |
|
66000dbe48c9
* xterm.c (handle_one_xevent): Do not pass key press events to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54185
diff
changeset
|
6239 #endif |
|
66000dbe48c9
* xterm.c (handle_one_xevent): Do not pass key press events to
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54185
diff
changeset
|
6240 |
| 49117 | 6241 event.xkey.state |
| 6242 |= x_emacs_to_x_modifiers (FRAME_X_DISPLAY_INFO (f), | |
| 6243 extra_keyboard_modifiers); | |
| 6244 modifiers = event.xkey.state; | |
| 6245 | |
| 6246 /* This will have to go some day... */ | |
| 6247 | |
| 6248 /* make_lispy_event turns chars into control chars. | |
| 6249 Don't do it here because XLookupString is too eager. */ | |
| 6250 event.xkey.state &= ~ControlMask; | |
| 6251 event.xkey.state &= ~(dpyinfo->meta_mod_mask | |
| 6252 | dpyinfo->super_mod_mask | |
| 6253 | dpyinfo->hyper_mod_mask | |
| 6254 | dpyinfo->alt_mod_mask); | |
| 6255 | |
| 6256 /* In case Meta is ComposeCharacter, | |
| 6257 clear its status. According to Markus Ehrnsperger | |
| 6258 Markus.Ehrnsperger@lehrstuhl-bross.physik.uni-muenchen.de | |
| 6259 this enables ComposeCharacter to work whether or | |
| 6260 not it is combined with Meta. */ | |
| 6261 if (modifiers & dpyinfo->meta_mod_mask) | |
| 6262 bzero (&compose_status, sizeof (compose_status)); | |
| 6263 | |
| 6264 #ifdef HAVE_X_I18N | |
| 6265 if (FRAME_XIC (f)) | |
| 6266 { | |
| 6267 Status status_return; | |
| 6268 | |
| 6269 coding_system = Vlocale_coding_system; | |
| 6270 nbytes = XmbLookupString (FRAME_XIC (f), | |
| 6271 &event.xkey, copy_bufptr, | |
| 6272 copy_bufsiz, &keysym, | |
| 6273 &status_return); | |
| 6274 if (status_return == XBufferOverflow) | |
| 6275 { | |
| 6276 copy_bufsiz = nbytes + 1; | |
| 6277 copy_bufptr = (char *) alloca (copy_bufsiz); | |
| 6278 nbytes = XmbLookupString (FRAME_XIC (f), | |
| 6279 &event.xkey, copy_bufptr, | |
| 6280 copy_bufsiz, &keysym, | |
| 6281 &status_return); | |
| 6282 } | |
| 6283 /* Xutf8LookupString is a new but already deprecated interface. -stef */ | |
| 6284 #if 0 && defined X_HAVE_UTF8_STRING | |
| 6285 else if (status_return == XLookupKeySym) | |
| 6286 { /* Try again but with utf-8. */ | |
| 6287 coding_system = Qutf_8; | |
| 6288 nbytes = Xutf8LookupString (FRAME_XIC (f), | |
| 6289 &event.xkey, copy_bufptr, | |
| 6290 copy_bufsiz, &keysym, | |
| 6291 &status_return); | |
| 6292 if (status_return == XBufferOverflow) | |
| 6293 { | |
| 6294 copy_bufsiz = nbytes + 1; | |
| 6295 copy_bufptr = (char *) alloca (copy_bufsiz); | |
| 6296 nbytes = Xutf8LookupString (FRAME_XIC (f), | |
| 6297 &event.xkey, | |
| 6298 copy_bufptr, | |
| 6299 copy_bufsiz, &keysym, | |
| 6300 &status_return); | |
| 6301 } | |
| 6302 } | |
| 6303 #endif | |
| 6304 | |
| 6305 if (status_return == XLookupNone) | |
| 6306 break; | |
| 6307 else if (status_return == XLookupChars) | |
| 6308 { | |
| 6309 keysym = NoSymbol; | |
| 6310 modifiers = 0; | |
| 6311 } | |
| 6312 else if (status_return != XLookupKeySym | |
| 6313 && status_return != XLookupBoth) | |
| 6314 abort (); | |
| 6315 } | |
| 6316 else | |
| 6317 nbytes = XLookupString (&event.xkey, copy_bufptr, | |
| 6318 copy_bufsiz, &keysym, | |
| 6319 &compose_status); | |
| 6320 #else | |
| 6321 nbytes = XLookupString (&event.xkey, copy_bufptr, | |
| 6322 copy_bufsiz, &keysym, | |
| 6323 &compose_status); | |
| 6324 #endif | |
| 6325 | |
|
53596
e3e8f1dcc895
* xterm.c (handle_one_xevent): Don't handle characters that are part
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53336
diff
changeset
|
6326 /* If not using XIM/XIC, and a compose sequence is in progress, |
|
e3e8f1dcc895
* xterm.c (handle_one_xevent): Don't handle characters that are part
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53336
diff
changeset
|
6327 we break here. Otherwise, chars_matched is always 0. */ |
|
e3e8f1dcc895
* xterm.c (handle_one_xevent): Don't handle characters that are part
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53336
diff
changeset
|
6328 if (compose_status.chars_matched > 0 && nbytes == 0) |
|
e3e8f1dcc895
* xterm.c (handle_one_xevent): Don't handle characters that are part
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53336
diff
changeset
|
6329 break; |
|
e3e8f1dcc895
* xterm.c (handle_one_xevent): Don't handle characters that are part
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53336
diff
changeset
|
6330 |
| 49117 | 6331 orig_keysym = keysym; |
| 6332 | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6333 /* Common for all keysym input events. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6334 XSETFRAME (inev.frame_or_window, f); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6335 inev.modifiers |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6336 = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), modifiers); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6337 inev.timestamp = event.xkey.time; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6338 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6339 /* First deal with keysyms which have defined |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6340 translations to characters. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6341 if (keysym >= 32 && keysym < 128) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6342 /* Avoid explicitly decoding each ASCII character. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6343 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6344 inev.kind = ASCII_KEYSTROKE_EVENT; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6345 inev.code = keysym; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6346 goto done_keysym; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6347 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6348 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6349 /* Now non-ASCII. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6350 if (HASH_TABLE_P (Vx_keysym_table) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6351 && (NATNUMP (c = Fgethash (make_number (keysym), |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6352 Vx_keysym_table, |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6353 Qnil)))) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6354 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6355 inev.kind = (SINGLE_BYTE_CHAR_P (XFASTINT (c)) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6356 ? ASCII_KEYSTROKE_EVENT |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6357 : MULTIBYTE_CHAR_KEYSTROKE_EVENT); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6358 inev.code = XFASTINT (c); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6359 goto done_keysym; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6360 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6361 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6362 /* Random non-modifier sorts of keysyms. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6363 if (((keysym >= XK_BackSpace && keysym <= XK_Escape) |
| 49117 | 6364 || keysym == XK_Delete |
| 6365 #ifdef XK_ISO_Left_Tab | |
| 6366 || (keysym >= XK_ISO_Left_Tab | |
| 6367 && keysym <= XK_ISO_Enter) | |
| 6368 #endif | |
| 6369 || IsCursorKey (keysym) /* 0xff50 <= x < 0xff60 */ | |
| 6370 || IsMiscFunctionKey (keysym) /* 0xff60 <= x < VARIES */ | |
| 6371 #ifdef HPUX | |
| 6372 /* This recognizes the "extended function | |
| 6373 keys". It seems there's no cleaner way. | |
| 6374 Test IsModifierKey to avoid handling | |
| 6375 mode_switch incorrectly. */ | |
| 6376 || ((unsigned) (keysym) >= XK_Select | |
| 6377 && (unsigned)(keysym) < XK_KP_Space) | |
| 6378 #endif | |
| 6379 #ifdef XK_dead_circumflex | |
| 6380 || orig_keysym == XK_dead_circumflex | |
| 6381 #endif | |
| 6382 #ifdef XK_dead_grave | |
| 6383 || orig_keysym == XK_dead_grave | |
| 6384 #endif | |
| 6385 #ifdef XK_dead_tilde | |
| 6386 || orig_keysym == XK_dead_tilde | |
| 6387 #endif | |
| 6388 #ifdef XK_dead_diaeresis | |
| 6389 || orig_keysym == XK_dead_diaeresis | |
| 6390 #endif | |
| 6391 #ifdef XK_dead_macron | |
| 6392 || orig_keysym == XK_dead_macron | |
| 6393 #endif | |
| 6394 #ifdef XK_dead_degree | |
| 6395 || orig_keysym == XK_dead_degree | |
| 6396 #endif | |
| 6397 #ifdef XK_dead_acute | |
| 6398 || orig_keysym == XK_dead_acute | |
| 6399 #endif | |
| 6400 #ifdef XK_dead_cedilla | |
| 6401 || orig_keysym == XK_dead_cedilla | |
| 6402 #endif | |
| 6403 #ifdef XK_dead_breve | |
| 6404 || orig_keysym == XK_dead_breve | |
| 6405 #endif | |
| 6406 #ifdef XK_dead_ogonek | |
| 6407 || orig_keysym == XK_dead_ogonek | |
| 6408 #endif | |
| 6409 #ifdef XK_dead_caron | |
| 6410 || orig_keysym == XK_dead_caron | |
| 6411 #endif | |
| 6412 #ifdef XK_dead_doubleacute | |
| 6413 || orig_keysym == XK_dead_doubleacute | |
| 6414 #endif | |
| 6415 #ifdef XK_dead_abovedot | |
| 6416 || orig_keysym == XK_dead_abovedot | |
| 6417 #endif | |
| 6418 || IsKeypadKey (keysym) /* 0xff80 <= x < 0xffbe */ | |
| 6419 || IsFunctionKey (keysym) /* 0xffbe <= x < 0xffe1 */ | |
| 6420 /* Any "vendor-specific" key is ok. */ | |
| 6421 || (orig_keysym & (1 << 28)) | |
| 6422 || (keysym != NoSymbol && nbytes == 0)) | |
| 6423 && ! (IsModifierKey (orig_keysym) | |
| 6424 #ifndef HAVE_X11R5 | |
| 6425 #ifdef XK_Mode_switch | |
| 6426 || ((unsigned)(orig_keysym) == XK_Mode_switch) | |
| 6427 #endif | |
| 6428 #ifdef XK_Num_Lock | |
| 6429 || ((unsigned)(orig_keysym) == XK_Num_Lock) | |
| 6430 #endif | |
| 6431 #endif /* not HAVE_X11R5 */ | |
| 6432 /* The symbols from XK_ISO_Lock | |
| 6433 to XK_ISO_Last_Group_Lock | |
| 6434 don't have real modifiers but | |
| 6435 should be treated similarly to | |
| 6436 Mode_switch by Emacs. */ | |
| 6437 #if defined XK_ISO_Lock && defined XK_ISO_Last_Group_Lock | |
| 6438 || ((unsigned)(orig_keysym) | |
| 6439 >= XK_ISO_Lock | |
| 6440 && (unsigned)(orig_keysym) | |
| 6441 <= XK_ISO_Last_Group_Lock) | |
| 6442 #endif | |
| 6443 )) | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6444 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6445 STORE_KEYSYM_FOR_DEBUG (keysym); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6446 /* make_lispy_event will convert this to a symbolic |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6447 key. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6448 inev.kind = NON_ASCII_KEYSTROKE_EVENT; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6449 inev.code = keysym; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6450 goto done_keysym; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6451 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6452 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6453 { /* Raw bytes, not keysym. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6454 register int i; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6455 register int c; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6456 int nchars, len; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6457 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6458 /* The input should be decoded with `coding_system' |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6459 which depends on which X*LookupString function |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6460 we used just above and the locale. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6461 setup_coding_system (coding_system, &coding); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6462 coding.src_multibyte = 0; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6463 coding.dst_multibyte = 1; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6464 /* The input is converted to events, thus we can't |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6465 handle composition. Anyway, there's no XIM that |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6466 gives us composition information. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6467 coding.composing = COMPOSITION_DISABLED; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6468 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6469 for (i = 0; i < nbytes; i++) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6470 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6471 STORE_KEYSYM_FOR_DEBUG (copy_bufptr[i]); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6472 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6473 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6474 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6475 /* Decode the input data. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6476 int require; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6477 unsigned char *p; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6478 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6479 require = decoding_buffer_size (&coding, nbytes); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6480 p = (unsigned char *) alloca (require); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6481 coding.mode |= CODING_MODE_LAST_BLOCK; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6482 /* We explicitly disable composition handling because |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6483 key data should not contain any composition sequence. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6484 coding.composing = COMPOSITION_DISABLED; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6485 decode_coding (&coding, copy_bufptr, p, nbytes, require); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6486 nbytes = coding.produced; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6487 nchars = coding.produced_char; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6488 copy_bufptr = p; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6489 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6490 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6491 /* Convert the input data to a sequence of |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6492 character events. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6493 for (i = 0; i < nbytes; i += len) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6494 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6495 if (nchars == nbytes) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6496 c = copy_bufptr[i], len = 1; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6497 else |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6498 c = STRING_CHAR_AND_LENGTH (copy_bufptr + i, |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6499 nbytes - i, len); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6500 inev.kind = (SINGLE_BYTE_CHAR_P (c) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6501 ? ASCII_KEYSTROKE_EVENT |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6502 : MULTIBYTE_CHAR_KEYSTROKE_EVENT); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6503 inev.code = c; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6504 kbd_buffer_store_event_hold (&inev, hold_quit); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6505 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6506 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6507 /* Previous code updated count by nchars rather than nbytes, |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6508 but that seems bogus to me. ++kfs */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6509 count += nbytes; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6510 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6511 inev.kind = NO_EVENT; /* Already stored above. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6512 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6513 if (keysym == NoSymbol) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6514 break; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6515 } |
| 49117 | 6516 } |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6517 done_keysym: |
| 49117 | 6518 #ifdef HAVE_X_I18N |
| 6519 /* Don't dispatch this event since XtDispatchEvent calls | |
| 6520 XFilterEvent, and two calls in a row may freeze the | |
| 6521 client. */ | |
| 6522 break; | |
| 6523 #else | |
| 6524 goto OTHER; | |
| 6525 #endif | |
| 6526 | |
| 6527 case KeyRelease: | |
| 6528 #ifdef HAVE_X_I18N | |
| 6529 /* Don't dispatch this event since XtDispatchEvent calls | |
| 6530 XFilterEvent, and two calls in a row may freeze the | |
| 6531 client. */ | |
| 6532 break; | |
| 6533 #else | |
| 6534 goto OTHER; | |
| 6535 #endif | |
| 6536 | |
| 6537 case EnterNotify: | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6538 x_detect_focus_change (dpyinfo, &event, &inev); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6539 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6540 f = x_any_window_to_frame (dpyinfo, event.xcrossing.window); |
| 49117 | 6541 |
|
54650
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6542 if (f && x_mouse_click_focus_ignore_position) |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6543 ignore_next_mouse_click_timeout = event.xmotion.time + 200; |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6544 |
| 49117 | 6545 #if 0 |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6546 if (event.xcrossing.focus) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6547 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6548 /* Avoid nasty pop/raise loops. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6549 if (f && (!(f->auto_raise) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6550 || !(f->auto_lower) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6551 || (event.xcrossing.time - enter_timestamp) > 500)) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6552 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6553 x_new_focus_frame (dpyinfo, f); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6554 enter_timestamp = event.xcrossing.time; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6555 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6556 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6557 else if (f == dpyinfo->x_focus_frame) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6558 x_new_focus_frame (dpyinfo, 0); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6559 #endif |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6560 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6561 /* EnterNotify counts as mouse movement, |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6562 so update things that depend on mouse position. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6563 if (f && !f->output_data.x->hourglass_p) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6564 note_mouse_movement (f, &event.xmotion); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6565 goto OTHER; |
| 49117 | 6566 |
| 6567 case FocusIn: | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6568 x_detect_focus_change (dpyinfo, &event, &inev); |
| 49117 | 6569 goto OTHER; |
| 6570 | |
| 6571 case LeaveNotify: | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6572 x_detect_focus_change (dpyinfo, &event, &inev); |
| 49117 | 6573 |
| 6574 f = x_top_window_to_frame (dpyinfo, event.xcrossing.window); | |
| 6575 if (f) | |
| 6576 { | |
| 6577 if (f == dpyinfo->mouse_face_mouse_frame) | |
| 6578 { | |
| 6579 /* If we move outside the frame, then we're | |
| 6580 certainly no longer on any text in the frame. */ | |
| 6581 clear_mouse_face (dpyinfo); | |
| 6582 dpyinfo->mouse_face_mouse_frame = 0; | |
| 6583 } | |
| 6584 | |
| 6585 /* Generate a nil HELP_EVENT to cancel a help-echo. | |
| 6586 Do it only if there's something to cancel. | |
| 6587 Otherwise, the startup message is cleared when | |
| 6588 the mouse leaves the frame. */ | |
| 6589 if (any_help_event_p) | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6590 do_help = -1; |
| 49117 | 6591 } |
| 6592 goto OTHER; | |
| 6593 | |
| 6594 case FocusOut: | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6595 x_detect_focus_change (dpyinfo, &event, &inev); |
| 49117 | 6596 goto OTHER; |
| 6597 | |
| 6598 case MotionNotify: | |
| 6599 { | |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6600 previous_help_echo_string = help_echo_string; |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6601 help_echo_string = help_echo_object = help_echo_window = Qnil; |
| 49117 | 6602 help_echo_pos = -1; |
| 6603 | |
| 6604 if (dpyinfo->grabbed && last_mouse_frame | |
| 6605 && FRAME_LIVE_P (last_mouse_frame)) | |
| 6606 f = last_mouse_frame; | |
| 6607 else | |
| 6608 f = x_window_to_frame (dpyinfo, event.xmotion.window); | |
| 6609 | |
| 6610 if (dpyinfo->mouse_face_hidden) | |
| 6611 { | |
| 6612 dpyinfo->mouse_face_hidden = 0; | |
| 6613 clear_mouse_face (dpyinfo); | |
| 6614 } | |
| 6615 | |
| 6616 if (f) | |
| 6617 { | |
| 6618 | |
| 6619 /* Generate SELECT_WINDOW_EVENTs when needed. */ | |
| 6620 if (mouse_autoselect_window) | |
| 6621 { | |
| 6622 Lisp_Object window; | |
| 6623 | |
| 6624 window = window_from_coordinates (f, | |
| 6625 event.xmotion.x, event.xmotion.y, | |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6626 0, 0, 0, 0); |
| 49117 | 6627 |
| 6628 /* Window will be selected only when it is not selected now and | |
| 6629 last mouse movement event was not in it. Minibuffer window | |
| 6630 will be selected iff it is active. */ | |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
6631 if (WINDOWP (window) |
| 49117 | 6632 && !EQ (window, last_window) |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6633 && !EQ (window, selected_window)) |
| 49117 | 6634 { |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6635 inev.kind = SELECT_WINDOW_EVENT; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6636 inev.frame_or_window = window; |
| 49117 | 6637 } |
| 6638 | |
| 6639 last_window=window; | |
| 6640 } | |
| 6641 note_mouse_movement (f, &event.xmotion); | |
| 6642 } | |
| 6643 else | |
| 6644 { | |
| 6645 #ifndef USE_TOOLKIT_SCROLL_BARS | |
| 6646 struct scroll_bar *bar | |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
6647 = x_window_to_scroll_bar (event.xmotion.display, |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
6648 event.xmotion.window); |
| 49117 | 6649 |
| 6650 if (bar) | |
| 6651 x_scroll_bar_note_movement (bar, &event); | |
| 6652 #endif /* USE_TOOLKIT_SCROLL_BARS */ | |
| 6653 | |
| 6654 /* If we move outside the frame, then we're | |
| 6655 certainly no longer on any text in the frame. */ | |
| 6656 clear_mouse_face (dpyinfo); | |
| 6657 } | |
| 6658 | |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6659 /* If the contents of the global variable help_echo_string |
| 49117 | 6660 has changed, generate a HELP_EVENT. */ |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6661 if (!NILP (help_echo_string) |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6662 || !NILP (previous_help_echo_string)) |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6663 do_help = 1; |
| 49117 | 6664 goto OTHER; |
| 6665 } | |
| 6666 | |
| 6667 case ConfigureNotify: | |
| 6668 f = x_top_window_to_frame (dpyinfo, event.xconfigure.window); | |
| 6669 if (f) | |
| 6670 { | |
| 6671 #ifndef USE_X_TOOLKIT | |
| 49322 | 6672 #ifdef USE_GTK |
| 6673 xg_resize_widgets (f, event.xconfigure.width, | |
| 6674 event.xconfigure.height); | |
| 6675 #else /* not USE_GTK */ | |
| 49117 | 6676 /* If there is a pending resize for fullscreen, don't |
| 6677 do this one, the right one will come later. | |
| 6678 The toolkit version doesn't seem to need this, but we | |
| 6679 need to reset it below. */ | |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
6680 int dont_resize |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6681 = ((f->want_fullscreen & FULLSCREEN_WAIT) |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6682 && f->new_text_cols != 0); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6683 int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, event.xconfigure.height); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6684 int columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, event.xconfigure.width); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6685 |
| 49117 | 6686 if (dont_resize) |
| 6687 goto OTHER; | |
| 6688 | |
| 6689 /* In the toolkit version, change_frame_size | |
| 6690 is called by the code that handles resizing | |
| 6691 of the EmacsFrame widget. */ | |
| 6692 | |
| 6693 /* Even if the number of character rows and columns has | |
| 6694 not changed, the font size may have changed, so we need | |
| 6695 to check the pixel dimensions as well. */ | |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6696 if (columns != FRAME_COLS (f) |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6697 || rows != FRAME_LINES (f) |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6698 || event.xconfigure.width != FRAME_PIXEL_WIDTH (f) |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6699 || event.xconfigure.height != FRAME_PIXEL_HEIGHT (f)) |
| 49117 | 6700 { |
| 6701 change_frame_size (f, rows, columns, 0, 1, 0); | |
| 6702 SET_FRAME_GARBAGED (f); | |
| 6703 cancel_mouse_face (f); | |
| 6704 } | |
| 49322 | 6705 #endif /* not USE_GTK */ |
| 49117 | 6706 #endif |
| 6707 | |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6708 FRAME_PIXEL_WIDTH (f) = event.xconfigure.width; |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6709 FRAME_PIXEL_HEIGHT (f) = event.xconfigure.height; |
| 49117 | 6710 |
| 49322 | 6711 #ifdef USE_GTK |
| 6712 /* GTK creates windows but doesn't map them. | |
| 6713 Only get real positions and check fullscreen when mapped. */ | |
| 6714 if (FRAME_GTK_OUTER_WIDGET (f) | |
| 6715 && GTK_WIDGET_MAPPED (FRAME_GTK_OUTER_WIDGET (f))) | |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6716 #endif |
| 49322 | 6717 { |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6718 /* What we have now is the position of Emacs's own window. |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6719 Convert that to the position of the window manager window. */ |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6720 x_real_positions (f, &f->left_pos, &f->top_pos); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6721 |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
6722 x_check_expected_move (f); |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6723 if (f->want_fullscreen & FULLSCREEN_WAIT) |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6724 f->want_fullscreen &= ~(FULLSCREEN_WAIT|FULLSCREEN_BOTH); |
| 49322 | 6725 } |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6726 |
| 49117 | 6727 #ifdef HAVE_X_I18N |
| 6728 if (FRAME_XIC (f) && (FRAME_XIC_STYLE (f) & XIMStatusArea)) | |
| 6729 xic_set_statusarea (f); | |
| 6730 #endif | |
| 6731 | |
| 6732 if (f->output_data.x->parent_desc != FRAME_X_DISPLAY_INFO (f)->root_window) | |
| 6733 { | |
| 6734 /* Since the WM decorations come below top_pos now, | |
| 6735 we must put them below top_pos in the future. */ | |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6736 f->win_gravity = NorthWestGravity; |
| 49117 | 6737 x_wm_set_size_hint (f, (long) 0, 0); |
| 6738 } | |
| 6739 } | |
| 6740 goto OTHER; | |
| 6741 | |
| 49322 | 6742 case ButtonRelease: |
| 49117 | 6743 case ButtonPress: |
| 6744 { | |
| 6745 /* If we decide we want to generate an event to be seen | |
| 6746 by the rest of Emacs, we put it here. */ | |
| 6747 int tool_bar_p = 0; | |
| 6748 | |
| 6749 bzero (&compose_status, sizeof (compose_status)); | |
| 6750 | |
| 6751 if (dpyinfo->grabbed | |
| 6752 && last_mouse_frame | |
| 6753 && FRAME_LIVE_P (last_mouse_frame)) | |
| 6754 f = last_mouse_frame; | |
| 6755 else | |
| 6756 f = x_window_to_frame (dpyinfo, event.xbutton.window); | |
| 6757 | |
| 6758 if (f) | |
| 6759 { | |
| 6760 /* Is this in the tool-bar? */ | |
| 6761 if (WINDOWP (f->tool_bar_window) | |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6762 && WINDOW_TOTAL_LINES (XWINDOW (f->tool_bar_window))) |
| 49117 | 6763 { |
| 6764 Lisp_Object window; | |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6765 int x = event.xbutton.x; |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6766 int y = event.xbutton.y; |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6767 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6768 window = window_from_coordinates (f, x, y, 0, 0, 0, 1); |
| 49117 | 6769 if (EQ (window, f->tool_bar_window)) |
| 6770 { | |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6771 if (event.xbutton.type == ButtonPress) |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6772 handle_tool_bar_click (f, x, y, 1, 0); |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6773 else |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6774 handle_tool_bar_click (f, x, y, 0, |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6775 x_x_to_emacs_modifiers (dpyinfo, |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6776 event.xbutton.state)); |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
6777 tool_bar_p = 1; |
| 49117 | 6778 } |
| 6779 } | |
| 6780 | |
| 6781 if (!tool_bar_p) | |
| 6782 if (!dpyinfo->x_focus_frame | |
| 6783 || f == dpyinfo->x_focus_frame) | |
| 49322 | 6784 { |
| 49326 | 6785 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) |
| 49322 | 6786 if (! popup_activated ()) |
| 49326 | 6787 #endif |
|
54650
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6788 { |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6789 if (ignore_next_mouse_click_timeout) |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6790 { |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6791 if (event.type == ButtonPress |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6792 && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0) |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6793 { |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6794 ignore_next_mouse_click_timeout = 0; |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6795 construct_mouse_click (&inev, &event, f); |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6796 } |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6797 if (event.type == ButtonRelease) |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6798 ignore_next_mouse_click_timeout = 0; |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6799 } |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6800 else |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6801 construct_mouse_click (&inev, &event, f); |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6802 } |
| 49322 | 6803 } |
| 49117 | 6804 } |
| 6805 else | |
| 6806 { | |
| 6807 struct scroll_bar *bar | |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
6808 = x_window_to_scroll_bar (event.xbutton.display, |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
6809 event.xbutton.window); |
| 49117 | 6810 |
|
50064
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
6811 #ifdef USE_TOOLKIT_SCROLL_BARS |
|
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
6812 /* Make the "Ctrl-Mouse-2 splits window" work for toolkit |
|
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
6813 scroll bars. */ |
|
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
6814 if (bar && event.xbutton.state & ControlMask) |
|
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
6815 { |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6816 x_scroll_bar_handle_click (bar, &event, &inev); |
|
50064
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
6817 *finish = X_EVENT_DROP; |
|
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
6818 } |
|
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
6819 #else /* not USE_TOOLKIT_SCROLL_BARS */ |
| 49117 | 6820 if (bar) |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6821 x_scroll_bar_handle_click (bar, &event, &inev); |
| 49117 | 6822 #endif /* not USE_TOOLKIT_SCROLL_BARS */ |
| 6823 } | |
| 6824 | |
| 6825 if (event.type == ButtonPress) | |
| 6826 { | |
| 6827 dpyinfo->grabbed |= (1 << event.xbutton.button); | |
| 6828 last_mouse_frame = f; | |
| 6829 /* Ignore any mouse motion that happened | |
| 6830 before this event; any subsequent mouse-movement | |
| 6831 Emacs events should reflect only motion after | |
| 6832 the ButtonPress. */ | |
| 6833 if (f != 0) | |
| 6834 f->mouse_moved = 0; | |
| 6835 | |
| 6836 if (!tool_bar_p) | |
| 6837 last_tool_bar_item = -1; | |
| 6838 } | |
| 6839 else | |
| 49322 | 6840 dpyinfo->grabbed &= ~(1 << event.xbutton.button); |
| 49117 | 6841 |
| 49322 | 6842 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) |
| 49117 | 6843 f = x_menubar_window_to_frame (dpyinfo, event.xbutton.window); |
| 6844 /* For a down-event in the menu bar, | |
| 6845 don't pass it to Xt right now. | |
| 6846 Instead, save it away | |
| 6847 and we will pass it to Xt from kbd_buffer_get_event. | |
| 6848 That way, we can run some Lisp code first. */ | |
| 49322 | 6849 if ( |
| 6850 #ifdef USE_GTK | |
| 6851 ! popup_activated () | |
| 6852 && | |
| 6853 #endif | |
| 6854 f && event.type == ButtonPress | |
| 49117 | 6855 /* Verify the event is really within the menu bar |
| 6856 and not just sent to it due to grabbing. */ | |
| 6857 && event.xbutton.x >= 0 | |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
6858 && event.xbutton.x < FRAME_PIXEL_WIDTH (f) |
| 49117 | 6859 && event.xbutton.y >= 0 |
| 6860 && event.xbutton.y < f->output_data.x->menubar_height | |
| 6861 && event.xbutton.same_screen) | |
| 6862 { | |
| 6863 SET_SAVED_BUTTON_EVENT; | |
| 6864 XSETFRAME (last_mouse_press_frame, f); | |
| 49322 | 6865 #ifdef USE_GTK |
| 6866 *finish = X_EVENT_DROP; | |
| 6867 #endif | |
| 49117 | 6868 } |
| 6869 else if (event.type == ButtonPress) | |
| 6870 { | |
| 6871 last_mouse_press_frame = Qnil; | |
| 6872 goto OTHER; | |
| 6873 } | |
| 6874 | |
| 6875 #ifdef USE_MOTIF /* This should do not harm for Lucid, | |
| 6876 but I am trying to be cautious. */ | |
| 6877 else if (event.type == ButtonRelease) | |
| 6878 { | |
| 6879 if (!NILP (last_mouse_press_frame)) | |
| 6880 { | |
| 6881 f = XFRAME (last_mouse_press_frame); | |
| 6882 if (f->output_data.x) | |
| 6883 SET_SAVED_BUTTON_EVENT; | |
| 6884 } | |
| 6885 else | |
| 6886 goto OTHER; | |
| 6887 } | |
| 6888 #endif /* USE_MOTIF */ | |
| 6889 else | |
| 6890 goto OTHER; | |
| 49322 | 6891 #endif /* USE_X_TOOLKIT || USE_GTK */ |
| 49117 | 6892 } |
| 6893 break; | |
| 6894 | |
| 6895 case CirculateNotify: | |
| 6896 goto OTHER; | |
| 6897 | |
| 6898 case CirculateRequest: | |
| 6899 goto OTHER; | |
| 6900 | |
| 6901 case VisibilityNotify: | |
| 6902 goto OTHER; | |
| 6903 | |
| 6904 case MappingNotify: | |
| 6905 /* Someone has changed the keyboard mapping - update the | |
| 6906 local cache. */ | |
| 6907 switch (event.xmapping.request) | |
| 6908 { | |
| 6909 case MappingModifier: | |
| 6910 x_find_modifier_meanings (dpyinfo); | |
| 6911 /* This is meant to fall through. */ | |
| 6912 case MappingKeyboard: | |
| 6913 XRefreshKeyboardMapping (&event.xmapping); | |
| 6914 } | |
| 6915 goto OTHER; | |
| 6916 | |
| 6917 default: | |
| 6918 OTHER: | |
| 6919 #ifdef USE_X_TOOLKIT | |
| 6920 BLOCK_INPUT; | |
|
50064
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
6921 if (*finish != X_EVENT_DROP) |
|
40170697bff1
Implement Ctrl-Mouse-2 (split vertically) for toolkit scrollbars
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
50056
diff
changeset
|
6922 XtDispatchEvent (&event); |
| 49117 | 6923 UNBLOCK_INPUT; |
| 6924 #endif /* USE_X_TOOLKIT */ | |
| 6925 break; | |
| 6926 } | |
| 6927 | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6928 done: |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6929 if (inev.kind != NO_EVENT) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6930 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6931 kbd_buffer_store_event_hold (&inev, hold_quit); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6932 count++; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6933 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6934 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6935 if (do_help |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6936 && !(hold_quit && hold_quit->kind != NO_EVENT)) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6937 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6938 Lisp_Object frame; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6939 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6940 if (f) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6941 XSETFRAME (frame, f); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6942 else |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6943 frame = Qnil; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6944 |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6945 if (do_help > 0) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6946 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6947 any_help_event_p = 1; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6948 gen_help_event (help_echo_string, frame, help_echo_window, |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6949 help_echo_object, help_echo_pos); |
|
54650
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
6950 } |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6951 else |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6952 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6953 help_echo_string = Qnil; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6954 gen_help_event (Qnil, frame, Qnil, Qnil, 0); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6955 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6956 count++; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6957 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6958 |
| 49117 | 6959 *eventp = event; |
| 6960 return count; | |
| 6961 } | |
| 6962 | |
| 6963 | |
| 6964 /* Handles the XEvent EVENT on display DISPLAY. | |
| 6965 This is used for event loops outside the normal event handling, | |
|
49434
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
6966 i.e. looping while a popup menu or a dialog is posted. |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
6967 |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
6968 Returns the value handle_one_xevent sets in the finish argument. */ |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
6969 int |
| 49117 | 6970 x_dispatch_event (event, display) |
| 6971 XEvent *event; | |
| 6972 Display *display; | |
| 6973 { | |
| 6974 struct x_display_info *dpyinfo; | |
|
49434
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
6975 int finish = X_EVENT_NORMAL; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
6976 |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
6977 dpyinfo = x_display_info_for_display (display); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
6978 |
| 49117 | 6979 if (dpyinfo) |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6980 handle_one_xevent (dpyinfo, event, &finish, 0); |
|
49434
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
6981 |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
6982 return finish; |
| 49117 | 6983 } |
| 6984 | |
| 6985 | |
| 286 | 6986 /* Read events coming from the X server. |
| 6987 This routine is called by the SIGIO handler. | |
| 6988 We return as soon as there are no more events to be read. | |
| 6989 | |
| 6990 We return the number of characters stored into the buffer, | |
| 6991 thus pretending to be `read'. | |
| 6992 | |
| 6993 EXPECTED is nonzero if the caller knows input is available. */ | |
| 6994 | |
|
43884
eb248012bf4a
(x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>: Use a fixed-size
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43839
diff
changeset
|
6995 static int |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6996 XTread_socket (sd, expected, hold_quit) |
| 286 | 6997 register int sd; |
| 6998 int expected; | |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
6999 struct input_event *hold_quit; |
| 286 | 7000 { |
| 7001 int count = 0; | |
| 7002 XEvent event; | |
|
3938
83d870a52936
* xterm.c (XTread_socket): Initialize event_found to zero, and
Jim Blandy <jimb@redhat.com>
parents:
3924
diff
changeset
|
7003 int event_found = 0; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
7004 struct x_display_info *dpyinfo; |
| 286 | 7005 |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2353
diff
changeset
|
7006 if (interrupt_input_blocked) |
| 286 | 7007 { |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2353
diff
changeset
|
7008 interrupt_input_pending = 1; |
| 286 | 7009 return -1; |
| 7010 } | |
| 7011 | |
|
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2353
diff
changeset
|
7012 interrupt_input_pending = 0; |
| 286 | 7013 BLOCK_INPUT; |
|
9337
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
7014 |
|
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
7015 /* So people can tell when we have read the available input. */ |
|
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
7016 input_signal_count++; |
|
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
7017 |
|
30083
998d20abc885
(XTread_socket): Increment handling_signal at the start,
Gerd Moellmann <gerd@gnu.org>
parents:
30050
diff
changeset
|
7018 ++handling_signal; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7019 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7020 /* Find the display we are supposed to read input for. |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7021 It's the one communicating on descriptor SD. */ |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7022 for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next) |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7023 { |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7024 #if 0 /* This ought to be unnecessary; let's verify it. */ |
| 286 | 7025 #ifdef FIOSNBIO |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7026 /* If available, Xlib uses FIOSNBIO to make the socket |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7027 non-blocking, and then looks for EWOULDBLOCK. If O_NDELAY is set, |
|
14165
65e51231924e
(XTread_socket): For selection_clear_event and
Richard M. Stallman <rms@gnu.org>
parents:
13898
diff
changeset
|
7028 FIOSNBIO is ignored, and instead of signaling EWOULDBLOCK, |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7029 a read returns 0, which Xlib interprets as equivalent to EPIPE. */ |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7030 fcntl (dpyinfo->connection, F_SETFL, 0); |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7031 #endif /* ! defined (FIOSNBIO) */ |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7032 #endif |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7033 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7034 #if 0 /* This code can't be made to work, with multiple displays, |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7035 and appears not to be used on any system any more. |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7036 Also keyboard.c doesn't turn O_NDELAY on and off |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7037 for X connections. */ |
| 286 | 7038 #ifndef SIGIO |
| 7039 #ifndef HAVE_SELECT | |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7040 if (! (fcntl (dpyinfo->connection, F_GETFL, 0) & O_NDELAY)) |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7041 { |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7042 extern int read_alarm_should_throw; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7043 read_alarm_should_throw = 1; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7044 XPeekEvent (dpyinfo->display, &event); |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7045 read_alarm_should_throw = 0; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7046 } |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7047 #endif /* HAVE_SELECT */ |
|
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7048 #endif /* SIGIO */ |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7049 #endif |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7050 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7051 /* For debugging, this gives a way to fake an I/O error. */ |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7052 if (dpyinfo == XTread_socket_fake_io_error) |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7053 { |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7054 XTread_socket_fake_io_error = 0; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7055 x_io_error_quitter (dpyinfo->display); |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7056 } |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7057 |
|
43812
20dbe11a2ad3
Added calls to x_session_check_input () and x_session_initialize ().
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
43713
diff
changeset
|
7058 #ifdef HAVE_X_SM |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7059 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7060 struct input_event inev; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7061 BLOCK_INPUT; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7062 /* We don't need to EVENT_INIT (inev) here, as |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7063 x_session_check_input copies an entire input_event. */ |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7064 if (x_session_check_input (&inev)) |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7065 { |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7066 kbd_buffer_store_event_hold (&inev, hold_quit); |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7067 count++; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7068 } |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7069 UNBLOCK_INPUT; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7070 } |
|
43812
20dbe11a2ad3
Added calls to x_session_check_input () and x_session_initialize ().
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
43713
diff
changeset
|
7071 #endif |
|
20dbe11a2ad3
Added calls to x_session_check_input () and x_session_initialize ().
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
43713
diff
changeset
|
7072 |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7073 #ifndef USE_GTK |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7074 while (XPending (dpyinfo->display)) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7075 { |
| 49117 | 7076 int finish; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
7077 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7078 XNextEvent (dpyinfo->display, &event); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7079 |
|
15973
6ad9e8fee494
(XTread_socket): Call XFilterEvent on all events,
Richard M. Stallman <rms@gnu.org>
parents:
15928
diff
changeset
|
7080 #ifdef HAVE_X_I18N |
|
49434
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
7081 /* Filter events for the current X input method. */ |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
7082 if (x_filter_event (dpyinfo, &event)) |
|
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
7083 break; |
|
15973
6ad9e8fee494
(XTread_socket): Call XFilterEvent on all events,
Richard M. Stallman <rms@gnu.org>
parents:
15928
diff
changeset
|
7084 #endif |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7085 event_found = 1; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7086 |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7087 count += handle_one_xevent (dpyinfo, &event, &finish, hold_quit); |
| 49117 | 7088 |
| 7089 if (finish == X_EVENT_GOTO_OUT) | |
| 7090 goto out; | |
| 7091 } | |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7092 #endif /* not USE_GTK */ |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7093 } |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7094 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7095 #ifdef USE_GTK |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7096 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7097 /* For GTK we must use the GTK event loop. But XEvents gets passed |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7098 to our filter function above, and then to the big event switch. |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7099 We use a bunch of globals to communicate with our filter function, |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7100 that is kind of ugly, but it works. |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7101 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7102 There is no way to do one display at the time, GTK just does events |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7103 from all displays. */ |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7104 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7105 while (gtk_events_pending ()) |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7106 { |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7107 current_count = count; |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7108 current_hold_quit = hold_quit; |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7109 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7110 gtk_main_iteration (); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7111 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7112 count = current_count; |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7113 current_count = -1; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7114 current_hold_quit = 0; |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7115 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7116 if (current_finish == X_EVENT_GOTO_OUT) |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7117 break; |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7118 } |
| 49322 | 7119 #endif /* USE_GTK */ |
| 286 | 7120 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7121 out:; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7122 |
|
8485
6e4b40c80021
(XTread_socket): Don't test X_IO_BUG; make that code unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
8437
diff
changeset
|
7123 /* On some systems, an X bug causes Emacs to get no more events |
|
6e4b40c80021
(XTread_socket): Don't test X_IO_BUG; make that code unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
8437
diff
changeset
|
7124 when the window is destroyed. Detect that. (1994.) */ |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
7125 if (! event_found) |
|
7916
50e9e0c8806a
(x_noop_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
7905
diff
changeset
|
7126 { |
|
50e9e0c8806a
(x_noop_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
7905
diff
changeset
|
7127 /* Emacs and the X Server eats up CPU time if XNoOp is done every time. |
|
50e9e0c8806a
(x_noop_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
7905
diff
changeset
|
7128 One XNOOP in 100 loops will make Emacs terminate. |
|
50e9e0c8806a
(x_noop_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
7905
diff
changeset
|
7129 B. Bretthauer, 1994 */ |
|
50e9e0c8806a
(x_noop_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
7905
diff
changeset
|
7130 x_noop_count++; |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
7131 if (x_noop_count >= 100) |
|
7916
50e9e0c8806a
(x_noop_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
7905
diff
changeset
|
7132 { |
|
50e9e0c8806a
(x_noop_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
7905
diff
changeset
|
7133 x_noop_count=0; |
|
12657
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
7134 |
|
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
7135 if (next_noop_dpyinfo == 0) |
|
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
7136 next_noop_dpyinfo = x_display_list; |
|
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
7137 |
|
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
7138 XNoOp (next_noop_dpyinfo->display); |
|
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
7139 |
|
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
7140 /* Each time we get here, cycle through the displays now open. */ |
|
05b7a5d25df6
(next_noop_dpyinfo): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12530
diff
changeset
|
7141 next_noop_dpyinfo = next_noop_dpyinfo->next; |
|
7916
50e9e0c8806a
(x_noop_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
7905
diff
changeset
|
7142 } |
|
50e9e0c8806a
(x_noop_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
7905
diff
changeset
|
7143 } |
|
5753
eb44ecad5557
(XTread_socket): Add X_IO_BUG conditional.
Richard M. Stallman <rms@gnu.org>
parents:
5740
diff
changeset
|
7144 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7145 /* If the focus was just given to an auto-raising frame, |
|
6883
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
7146 raise it now. */ |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7147 /* ??? This ought to be able to handle more than one such frame. */ |
|
6883
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
7148 if (pending_autoraise_frame) |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
7149 { |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
7150 x_raise_frame (pending_autoraise_frame); |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
7151 pending_autoraise_frame = 0; |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
7152 } |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
7153 |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7154 --handling_signal; |
| 286 | 7155 UNBLOCK_INPUT; |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
7156 |
| 286 | 7157 return count; |
| 7158 } | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7159 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7160 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7161 |
| 286 | 7162 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7163 /*********************************************************************** |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7164 Text Cursor |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7165 ***********************************************************************/ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7166 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7167 /* Set clipping for output in glyph row ROW. W is the window in which |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7168 we operate. GC is the graphics context to set clipping in. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7169 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7170 ROW may be a text row or, e.g., a mode line. Text rows must be |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7171 clipped to the interior of the window dedicated to text display, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7172 mode lines must be clipped to the whole window. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7173 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7174 static void |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7175 x_clip_to_row (w, row, gc) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7176 struct window *w; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7177 struct glyph_row *row; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7178 GC gc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7179 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7180 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7181 XRectangle clip_rect; |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7182 int window_y, window_width; |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7183 |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7184 window_box (w, -1, 0, &window_y, &window_width, 0); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7185 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7186 clip_rect.x = WINDOW_TO_FRAME_PIXEL_X (w, 0); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7187 clip_rect.y = WINDOW_TO_FRAME_PIXEL_Y (w, row->y); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7188 clip_rect.y = max (clip_rect.y, window_y); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7189 clip_rect.width = window_width; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7190 clip_rect.height = row->visible_height; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7191 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7192 XSetClipRectangles (FRAME_X_DISPLAY (f), gc, 0, 0, &clip_rect, 1, Unsorted); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7193 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7194 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7195 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7196 /* Draw a hollow box cursor on window W in glyph row ROW. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7197 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7198 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7199 x_draw_hollow_cursor (w, row) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7200 struct window *w; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7201 struct glyph_row *row; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7202 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7203 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7204 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7205 Display *dpy = FRAME_X_DISPLAY (f); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7206 int x, y, wd, h; |
|
18775
fcfa336f737e
(x_draw_box): Use scratch_cursor_gc to draw the cursor
Richard M. Stallman <rms@gnu.org>
parents:
18733
diff
changeset
|
7207 XGCValues xgcv; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7208 struct glyph *cursor_glyph; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7209 GC gc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7210 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7211 /* Get the glyph the cursor is on. If we can't tell because |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7212 the current matrix is invalid or such, give up. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7213 cursor_glyph = get_phys_cursor_glyph (w); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7214 if (cursor_glyph == NULL) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7215 return; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7216 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7217 /* Compute the width of the rectangle to draw. If on a stretch |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7218 glyph, and `x-stretch-block-cursor' is nil, don't draw a |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7219 rectangle as wide as the glyph, but use a canonical character |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7220 width instead. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7221 wd = cursor_glyph->pixel_width - 1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7222 if (cursor_glyph->type == STRETCH_GLYPH |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7223 && !x_stretch_cursor_p) |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7224 wd = min (FRAME_COLUMN_WIDTH (f), wd); |
|
44774
f2158eb57017
(x_draw_hollow_cursor, x_draw_bar_cursor)
Gerd Moellmann <gerd@gnu.org>
parents:
44763
diff
changeset
|
7225 w->phys_cursor_width = wd; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7226 |
|
53336
9a1b69cfa7be
(Qface, Qmouse_face): Remove unused externs.
Kim F. Storm <storm@cua.dk>
parents:
53083
diff
changeset
|
7227 /* Compute frame-relative coordinates from window-relative |
|
9a1b69cfa7be
(Qface, Qmouse_face): Remove unused externs.
Kim F. Storm <storm@cua.dk>
parents:
53083
diff
changeset
|
7228 coordinates. */ |
|
9a1b69cfa7be
(Qface, Qmouse_face): Remove unused externs.
Kim F. Storm <storm@cua.dk>
parents:
53083
diff
changeset
|
7229 x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x); |
|
9a1b69cfa7be
(Qface, Qmouse_face): Remove unused externs.
Kim F. Storm <storm@cua.dk>
parents:
53083
diff
changeset
|
7230 y = WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y); |
|
9a1b69cfa7be
(Qface, Qmouse_face): Remove unused externs.
Kim F. Storm <storm@cua.dk>
parents:
53083
diff
changeset
|
7231 |
|
9a1b69cfa7be
(Qface, Qmouse_face): Remove unused externs.
Kim F. Storm <storm@cua.dk>
parents:
53083
diff
changeset
|
7232 /* Compute the proper height and ascent of the rectangle, based |
|
9a1b69cfa7be
(Qface, Qmouse_face): Remove unused externs.
Kim F. Storm <storm@cua.dk>
parents:
53083
diff
changeset
|
7233 on the actual glyph. Using the full height of the row looks |
|
9a1b69cfa7be
(Qface, Qmouse_face): Remove unused externs.
Kim F. Storm <storm@cua.dk>
parents:
53083
diff
changeset
|
7234 bad when there are tall images on that row. */ |
|
9a1b69cfa7be
(Qface, Qmouse_face): Remove unused externs.
Kim F. Storm <storm@cua.dk>
parents:
53083
diff
changeset
|
7235 h = max (FRAME_LINE_HEIGHT (f), cursor_glyph->ascent + cursor_glyph->descent); |
|
9a1b69cfa7be
(Qface, Qmouse_face): Remove unused externs.
Kim F. Storm <storm@cua.dk>
parents:
53083
diff
changeset
|
7236 if (h < row->height) |
|
9a1b69cfa7be
(Qface, Qmouse_face): Remove unused externs.
Kim F. Storm <storm@cua.dk>
parents:
53083
diff
changeset
|
7237 y += row->ascent /* - w->phys_cursor_ascent */ + cursor_glyph->descent - h; |
|
9a1b69cfa7be
(Qface, Qmouse_face): Remove unused externs.
Kim F. Storm <storm@cua.dk>
parents:
53083
diff
changeset
|
7238 h--; |
|
9a1b69cfa7be
(Qface, Qmouse_face): Remove unused externs.
Kim F. Storm <storm@cua.dk>
parents:
53083
diff
changeset
|
7239 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7240 /* The foreground of cursor_gc is typically the same as the normal |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7241 background color, which can cause the cursor box to be invisible. */ |
|
18775
fcfa336f737e
(x_draw_box): Use scratch_cursor_gc to draw the cursor
Richard M. Stallman <rms@gnu.org>
parents:
18733
diff
changeset
|
7242 xgcv.foreground = f->output_data.x->cursor_pixel; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7243 if (dpyinfo->scratch_cursor_gc) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7244 XChangeGC (dpy, dpyinfo->scratch_cursor_gc, GCForeground, &xgcv); |
|
18775
fcfa336f737e
(x_draw_box): Use scratch_cursor_gc to draw the cursor
Richard M. Stallman <rms@gnu.org>
parents:
18733
diff
changeset
|
7245 else |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7246 dpyinfo->scratch_cursor_gc = XCreateGC (dpy, FRAME_X_WINDOW (f), |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7247 GCForeground, &xgcv); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7248 gc = dpyinfo->scratch_cursor_gc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7249 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7250 /* Set clipping, draw the rectangle, and reset clipping again. */ |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7251 x_clip_to_row (w, row, gc); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7252 XDrawRectangle (dpy, FRAME_X_WINDOW (f), gc, x, y, wd, h); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7253 XSetClipMask (dpy, gc, None); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7254 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7255 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7256 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7257 /* Draw a bar cursor on window W in glyph row ROW. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7258 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7259 Implementation note: One would like to draw a bar cursor with an |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7260 angle equal to the one given by the font property XA_ITALIC_ANGLE. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7261 Unfortunately, I didn't find a font yet that has this property set. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7262 --gerd. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7263 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7264 static void |
|
44690
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7265 x_draw_bar_cursor (w, row, width, kind) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7266 struct window *w; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7267 struct glyph_row *row; |
|
28321
fc0a61d81fc5
(x_display_and_set_cursor): Choose cursor depending
Gerd Moellmann <gerd@gnu.org>
parents:
28307
diff
changeset
|
7268 int width; |
|
44690
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7269 enum text_cursor_kinds kind; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7270 { |
|
30742
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7271 struct frame *f = XFRAME (w->frame); |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7272 struct glyph *cursor_glyph; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7273 |
|
30742
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7274 /* If cursor is out of bounds, don't draw garbage. This can happen |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7275 in mini-buffer windows when switching between echo area glyphs |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7276 and mini-buffer. */ |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7277 cursor_glyph = get_phys_cursor_glyph (w); |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7278 if (cursor_glyph == NULL) |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7279 return; |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7280 |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7281 /* If on an image, draw like a normal cursor. That's usually better |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7282 visible than drawing a bar, esp. if the image is large so that |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7283 the bar might not be in the window. */ |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7284 if (cursor_glyph->type == IMAGE_GLYPH) |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7285 { |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7286 struct glyph_row *row; |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7287 row = MATRIX_ROW (w->current_matrix, w->phys_cursor.vpos); |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7288 draw_phys_cursor_glyph (w, row, DRAW_CURSOR); |
|
30742
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7289 } |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7290 else |
|
e25bfc3f618c
(x_draw_bar_cursor): If cursor is on an image, draw a
Gerd Moellmann <gerd@gnu.org>
parents:
30700
diff
changeset
|
7291 { |
|
41073
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7292 Display *dpy = FRAME_X_DISPLAY (f); |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7293 Window window = FRAME_X_WINDOW (f); |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7294 GC gc = FRAME_X_DISPLAY_INFO (f)->scratch_cursor_gc; |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7295 unsigned long mask = GCForeground | GCBackground | GCGraphicsExposures; |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7296 struct face *face = FACE_FROM_ID (f, cursor_glyph->face_id); |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7297 XGCValues xgcv; |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7298 |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7299 /* If the glyph's background equals the color we normally draw |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7300 the bar cursor in, the bar cursor in its normal color is |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7301 invisible. Use the glyph's foreground color instead in this |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7302 case, on the assumption that the glyph's colors are chosen so |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7303 that the glyph is legible. */ |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7304 if (face->background == f->output_data.x->cursor_pixel) |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7305 xgcv.background = xgcv.foreground = face->foreground; |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7306 else |
|
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7307 xgcv.background = xgcv.foreground = f->output_data.x->cursor_pixel; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7308 xgcv.graphics_exposures = 0; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7309 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7310 if (gc) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7311 XChangeGC (dpy, gc, mask, &xgcv); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7312 else |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7313 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7314 gc = XCreateGC (dpy, window, mask, &xgcv); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7315 FRAME_X_DISPLAY_INFO (f)->scratch_cursor_gc = gc; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7316 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7317 |
|
28321
fc0a61d81fc5
(x_display_and_set_cursor): Choose cursor depending
Gerd Moellmann <gerd@gnu.org>
parents:
28307
diff
changeset
|
7318 if (width < 0) |
|
47143
264271f9ab24
(x_specified_cursor_type): Remove prototype.
Kim F. Storm <storm@cua.dk>
parents:
47057
diff
changeset
|
7319 width = FRAME_CURSOR_WIDTH (f); |
|
41073
3dafa2c81609
(x_draw_bar_cursor): If the background color of the
Gerd Moellmann <gerd@gnu.org>
parents:
40957
diff
changeset
|
7320 width = min (cursor_glyph->pixel_width, width); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7321 |
|
44774
f2158eb57017
(x_draw_hollow_cursor, x_draw_bar_cursor)
Gerd Moellmann <gerd@gnu.org>
parents:
44763
diff
changeset
|
7322 w->phys_cursor_width = width; |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7323 x_clip_to_row (w, row, gc); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7324 |
|
44690
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7325 if (kind == BAR_CURSOR) |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7326 XFillRectangle (dpy, window, gc, |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7327 WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x), |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7328 WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y), |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7329 width, row->height); |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7330 else |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7331 XFillRectangle (dpy, window, gc, |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7332 WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x), |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7333 WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y + |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7334 row->height - width), |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7335 cursor_glyph->pixel_width, |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7336 width); |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7337 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7338 XSetClipMask (dpy, gc, None); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7339 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7340 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7341 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7342 |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7343 /* RIF: Define cursor CURSOR on frame F. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7344 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7345 static void |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7346 x_define_frame_cursor (f, cursor) |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7347 struct frame *f; |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7348 Cursor cursor; |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7349 { |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7350 XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), cursor); |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7351 } |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7352 |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7353 |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7354 /* RIF: Clear area on frame F. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7355 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7356 static void |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7357 x_clear_frame_area (f, x, y, width, height) |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7358 struct frame *f; |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7359 int x, y, width, height; |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7360 { |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7361 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7362 x, y, width, height, False); |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7363 } |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7364 |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7365 |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7366 /* RIF: Draw cursor on window W. */ |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7367 |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7368 static void |
|
50243
3fb54e5a7201
(struct redisplay_interface): Add active_p argument to
Kim F. Storm <storm@cua.dk>
parents:
50237
diff
changeset
|
7369 x_draw_window_cursor (w, glyph_row, x, y, cursor_type, cursor_width, on_p, active_p) |
|
37922
fcd11c3e6341
(cursor_in_mouse_face_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37726
diff
changeset
|
7370 struct window *w; |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7371 struct glyph_row *glyph_row; |
|
50243
3fb54e5a7201
(struct redisplay_interface): Add active_p argument to
Kim F. Storm <storm@cua.dk>
parents:
50237
diff
changeset
|
7372 int x, y; |
|
3fb54e5a7201
(struct redisplay_interface): Add active_p argument to
Kim F. Storm <storm@cua.dk>
parents:
50237
diff
changeset
|
7373 int cursor_type, cursor_width; |
|
3fb54e5a7201
(struct redisplay_interface): Add active_p argument to
Kim F. Storm <storm@cua.dk>
parents:
50237
diff
changeset
|
7374 int on_p, active_p; |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7375 { |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7376 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7377 |
|
50243
3fb54e5a7201
(struct redisplay_interface): Add active_p argument to
Kim F. Storm <storm@cua.dk>
parents:
50237
diff
changeset
|
7378 if (on_p) |
|
3fb54e5a7201
(struct redisplay_interface): Add active_p argument to
Kim F. Storm <storm@cua.dk>
parents:
50237
diff
changeset
|
7379 { |
|
3fb54e5a7201
(struct redisplay_interface): Add active_p argument to
Kim F. Storm <storm@cua.dk>
parents:
50237
diff
changeset
|
7380 w->phys_cursor_type = cursor_type; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7381 w->phys_cursor_on_p = 1; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7382 |
|
53609
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
7383 if (glyph_row->exact_window_width_line_p |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
7384 && w->phys_cursor.hpos >= glyph_row->used[TEXT_AREA]) |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
7385 { |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
7386 glyph_row->cursor_in_fringe_p = 1; |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
7387 draw_fringe_bitmap (w, glyph_row, 0); |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
7388 } |
|
0bb1ce3944cd
(x_update_window_end): Call draw_window_fringes.
Kim F. Storm <storm@cua.dk>
parents:
53596
diff
changeset
|
7389 else |
|
50243
3fb54e5a7201
(struct redisplay_interface): Add active_p argument to
Kim F. Storm <storm@cua.dk>
parents:
50237
diff
changeset
|
7390 switch (cursor_type) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7391 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7392 case HOLLOW_BOX_CURSOR: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7393 x_draw_hollow_cursor (w, glyph_row); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7394 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7395 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7396 case FILLED_BOX_CURSOR: |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
7397 draw_phys_cursor_glyph (w, glyph_row, DRAW_CURSOR); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7398 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7399 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7400 case BAR_CURSOR: |
|
50243
3fb54e5a7201
(struct redisplay_interface): Add active_p argument to
Kim F. Storm <storm@cua.dk>
parents:
50237
diff
changeset
|
7401 x_draw_bar_cursor (w, glyph_row, cursor_width, BAR_CURSOR); |
|
44690
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7402 break; |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7403 |
|
8826cd76618a
(x_draw_bar_cursor): New argument KIND; callers changed.
Eli Zaretskii <eliz@gnu.org>
parents:
44626
diff
changeset
|
7404 case HBAR_CURSOR: |
|
50243
3fb54e5a7201
(struct redisplay_interface): Add active_p argument to
Kim F. Storm <storm@cua.dk>
parents:
50237
diff
changeset
|
7405 x_draw_bar_cursor (w, glyph_row, cursor_width, HBAR_CURSOR); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7406 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7407 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7408 case NO_CURSOR: |
|
44814
06d704d7ed94
(x_display_and_set_cursor): Set phys_cursor_width to
Gerd Moellmann <gerd@gnu.org>
parents:
44805
diff
changeset
|
7409 w->phys_cursor_width = 0; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7410 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7411 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7412 default: |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7413 abort (); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7414 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7415 |
|
27619
1d5c785bca99
* xterm.c (x_display_and_set_cursor): Set pre-edit area.
Gerd Moellmann <gerd@gnu.org>
parents:
27542
diff
changeset
|
7416 #ifdef HAVE_X_I18N |
|
1d5c785bca99
* xterm.c (x_display_and_set_cursor): Set pre-edit area.
Gerd Moellmann <gerd@gnu.org>
parents:
27542
diff
changeset
|
7417 if (w == XWINDOW (f->selected_window)) |
|
1d5c785bca99
* xterm.c (x_display_and_set_cursor): Set pre-edit area.
Gerd Moellmann <gerd@gnu.org>
parents:
27542
diff
changeset
|
7418 if (FRAME_XIC (f) && (FRAME_XIC_STYLE (f) & XIMPreeditPosition)) |
|
1d5c785bca99
* xterm.c (x_display_and_set_cursor): Set pre-edit area.
Gerd Moellmann <gerd@gnu.org>
parents:
27542
diff
changeset
|
7419 xic_set_preeditarea (w, x, y); |
|
1d5c785bca99
* xterm.c (x_display_and_set_cursor): Set pre-edit area.
Gerd Moellmann <gerd@gnu.org>
parents:
27542
diff
changeset
|
7420 #endif |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7421 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7422 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7423 #ifndef XFlush |
| 771 | 7424 if (updating_frame != f) |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
7425 XFlush (FRAME_X_DISPLAY (f)); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7426 #endif |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7427 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7428 |
| 286 | 7429 |
| 7430 /* Icons. */ | |
| 7431 | |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
7432 /* Make the x-window of frame F use the gnu icon bitmap. */ |
| 286 | 7433 |
| 7434 int | |
|
9565
255d98c7cd67
(dumpglyphs): Explicitly draw background stipple.
Richard M. Stallman <rms@gnu.org>
parents:
9542
diff
changeset
|
7435 x_bitmap_icon (f, file) |
| 771 | 7436 struct frame *f; |
|
9565
255d98c7cd67
(dumpglyphs): Explicitly draw background stipple.
Richard M. Stallman <rms@gnu.org>
parents:
9542
diff
changeset
|
7437 Lisp_Object file; |
| 286 | 7438 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7439 int bitmap_id; |
| 286 | 7440 |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7441 if (FRAME_X_WINDOW (f) == 0) |
| 286 | 7442 return 1; |
| 7443 | |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7444 /* Free up our existing icon bitmap and mask if any. */ |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
7445 if (f->output_data.x->icon_bitmap > 0) |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
7446 x_destroy_bitmap (f, f->output_data.x->icon_bitmap); |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
7447 f->output_data.x->icon_bitmap = 0; |
|
9565
255d98c7cd67
(dumpglyphs): Explicitly draw background stipple.
Richard M. Stallman <rms@gnu.org>
parents:
9542
diff
changeset
|
7448 |
|
255d98c7cd67
(dumpglyphs): Explicitly draw background stipple.
Richard M. Stallman <rms@gnu.org>
parents:
9542
diff
changeset
|
7449 if (STRINGP (file)) |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7450 { |
|
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7451 #ifdef USE_GTK |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7452 /* Use gtk_window_set_icon_from_file () if available, |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7453 It's not restricted to bitmaps */ |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7454 if (xg_set_icon (f, file)) |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7455 return 0; |
|
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7456 #endif /* USE_GTK */ |
|
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7457 bitmap_id = x_create_bitmap_from_file (f, file); |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7458 x_create_bitmap_mask (f, bitmap_id); |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7459 } |
|
9542
f8b7a65a94bc
(x_bitmap_icon): Allow bitmap to come from file.
Richard M. Stallman <rms@gnu.org>
parents:
9537
diff
changeset
|
7460 else |
|
f8b7a65a94bc
(x_bitmap_icon): Allow bitmap to come from file.
Richard M. Stallman <rms@gnu.org>
parents:
9537
diff
changeset
|
7461 { |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7462 /* Create the GNU bitmap and mask if necessary. */ |
|
10755
e5f13cc95d02
(x_bitmap_icon): Fix test for unallocated icon bitmap.
Paul Reilly <pmr@pajato.com>
parents:
10743
diff
changeset
|
7463 if (FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id < 0) |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7464 { |
|
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7465 FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id |
|
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7466 = x_create_bitmap_from_data (f, gnu_bits, |
|
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7467 gnu_width, gnu_height); |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7468 x_create_bitmap_mask (f, FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id); |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7469 } |
|
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7470 |
|
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7471 /* The first time we create the GNU bitmap and mask, |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7472 this increments the ref-count one extra time. |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
7473 As a result, the GNU bitmap and mask are never freed. |
|
9565
255d98c7cd67
(dumpglyphs): Explicitly draw background stipple.
Richard M. Stallman <rms@gnu.org>
parents:
9542
diff
changeset
|
7474 That way, we don't have to worry about allocating it again. */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
7475 x_reference_bitmap (f, FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
7476 |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
7477 bitmap_id = FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id; |
|
9542
f8b7a65a94bc
(x_bitmap_icon): Allow bitmap to come from file.
Richard M. Stallman <rms@gnu.org>
parents:
9537
diff
changeset
|
7478 } |
|
f8b7a65a94bc
(x_bitmap_icon): Allow bitmap to come from file.
Richard M. Stallman <rms@gnu.org>
parents:
9537
diff
changeset
|
7479 |
|
f8b7a65a94bc
(x_bitmap_icon): Allow bitmap to come from file.
Richard M. Stallman <rms@gnu.org>
parents:
9537
diff
changeset
|
7480 x_wm_set_icon_pixmap (f, bitmap_id); |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
7481 f->output_data.x->icon_bitmap = bitmap_id; |
| 286 | 7482 |
| 7483 return 0; | |
| 7484 } | |
| 7485 | |
| 7486 | |
|
12074
111aadc2521a
(x_text_icon): Do call XSetIconName or XSetWMIconName.
Karl Heuer <kwzh@gnu.org>
parents:
12000
diff
changeset
|
7487 /* Make the x-window of frame F use a rectangle with text. |
|
111aadc2521a
(x_text_icon): Do call XSetIconName or XSetWMIconName.
Karl Heuer <kwzh@gnu.org>
parents:
12000
diff
changeset
|
7488 Use ICON_NAME as the text. */ |
| 286 | 7489 |
| 7490 int | |
| 771 | 7491 x_text_icon (f, icon_name) |
| 7492 struct frame *f; | |
| 286 | 7493 char *icon_name; |
| 7494 { | |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7495 if (FRAME_X_WINDOW (f) == 0) |
| 286 | 7496 return 1; |
| 7497 | |
|
12074
111aadc2521a
(x_text_icon): Do call XSetIconName or XSetWMIconName.
Karl Heuer <kwzh@gnu.org>
parents:
12000
diff
changeset
|
7498 #ifdef HAVE_X11R4 |
|
111aadc2521a
(x_text_icon): Do call XSetIconName or XSetWMIconName.
Karl Heuer <kwzh@gnu.org>
parents:
12000
diff
changeset
|
7499 { |
|
111aadc2521a
(x_text_icon): Do call XSetIconName or XSetWMIconName.
Karl Heuer <kwzh@gnu.org>
parents:
12000
diff
changeset
|
7500 XTextProperty text; |
|
111aadc2521a
(x_text_icon): Do call XSetIconName or XSetWMIconName.
Karl Heuer <kwzh@gnu.org>
parents:
12000
diff
changeset
|
7501 text.value = (unsigned char *) icon_name; |
|
111aadc2521a
(x_text_icon): Do call XSetIconName or XSetWMIconName.
Karl Heuer <kwzh@gnu.org>
parents:
12000
diff
changeset
|
7502 text.encoding = XA_STRING; |
|
111aadc2521a
(x_text_icon): Do call XSetIconName or XSetWMIconName.
Karl Heuer <kwzh@gnu.org>
parents:
12000
diff
changeset
|
7503 text.format = 8; |
|
111aadc2521a
(x_text_icon): Do call XSetIconName or XSetWMIconName.
Karl Heuer <kwzh@gnu.org>
parents:
12000
diff
changeset
|
7504 text.nitems = strlen (icon_name); |
|
49644
834df49192b0
Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
7505 XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text); |
|
12074
111aadc2521a
(x_text_icon): Do call XSetIconName or XSetWMIconName.
Karl Heuer <kwzh@gnu.org>
parents:
12000
diff
changeset
|
7506 } |
|
111aadc2521a
(x_text_icon): Do call XSetIconName or XSetWMIconName.
Karl Heuer <kwzh@gnu.org>
parents:
12000
diff
changeset
|
7507 #else /* not HAVE_X11R4 */ |
|
49644
834df49192b0
Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
7508 XSetIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), icon_name); |
|
12074
111aadc2521a
(x_text_icon): Do call XSetIconName or XSetWMIconName.
Karl Heuer <kwzh@gnu.org>
parents:
12000
diff
changeset
|
7509 #endif /* not HAVE_X11R4 */ |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
7510 |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
7511 if (f->output_data.x->icon_bitmap > 0) |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
7512 x_destroy_bitmap (f, f->output_data.x->icon_bitmap); |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
7513 f->output_data.x->icon_bitmap = 0; |
|
976
cbdfc337ec8f
* xterm.c (x_wm_hints): New variable.
Jim Blandy <jimb@redhat.com>
parents:
786
diff
changeset
|
7514 x_wm_set_icon_pixmap (f, 0); |
| 286 | 7515 |
| 7516 return 0; | |
| 7517 } | |
| 7518 | |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7519 #define X_ERROR_MESSAGE_SIZE 200 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7520 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7521 /* If non-nil, this should be a string. |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7522 It means catch X errors and store the error message in this string. */ |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7523 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7524 static Lisp_Object x_error_message_string; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7525 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7526 /* An X error handler which stores the error message in |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7527 x_error_message_string. This is called from x_error_handler if |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7528 x_catch_errors is in effect. */ |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7529 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7530 static void |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7531 x_error_catcher (display, error) |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7532 Display *display; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7533 XErrorEvent *error; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7534 { |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7535 XGetErrorText (display, error->error_code, |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7536 SDATA (x_error_message_string), |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7537 X_ERROR_MESSAGE_SIZE); |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7538 } |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7539 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7540 /* Begin trapping X errors for display DPY. Actually we trap X errors |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7541 for all displays, but DPY should be the display you are actually |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7542 operating on. |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7543 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7544 After calling this function, X protocol errors no longer cause |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7545 Emacs to exit; instead, they are recorded in the string |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7546 stored in x_error_message_string. |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7547 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7548 Calling x_check_errors signals an Emacs error if an X error has |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7549 occurred since the last call to x_catch_errors or x_check_errors. |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7550 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7551 Calling x_uncatch_errors resumes the normal error handling. */ |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7552 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7553 void x_check_errors (); |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7554 static Lisp_Object x_catch_errors_unwind (); |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7555 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7556 int |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7557 x_catch_errors (dpy) |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7558 Display *dpy; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7559 { |
|
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46159
diff
changeset
|
7560 int count = SPECPDL_INDEX (); |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7561 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7562 /* Make sure any errors from previous requests have been dealt with. */ |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7563 XSync (dpy, False); |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7564 |
|
49054
6b6ac8aa78d2
(x_catch_errors): Save dpy using make_save_value.
Richard M. Stallman <rms@gnu.org>
parents:
48383
diff
changeset
|
7565 record_unwind_protect (x_catch_errors_unwind, |
|
6b6ac8aa78d2
(x_catch_errors): Save dpy using make_save_value.
Richard M. Stallman <rms@gnu.org>
parents:
48383
diff
changeset
|
7566 Fcons (make_save_value (dpy, 0), |
|
6b6ac8aa78d2
(x_catch_errors): Save dpy using make_save_value.
Richard M. Stallman <rms@gnu.org>
parents:
48383
diff
changeset
|
7567 x_error_message_string)); |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7568 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7569 x_error_message_string = make_uninit_string (X_ERROR_MESSAGE_SIZE); |
|
46435
278371336b60
* xterm.c (x_catch_errors, x_clear_errors): Use SSET.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
7570 SSET (x_error_message_string, 0, 0); |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7571 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7572 return count; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7573 } |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7574 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7575 /* Unbind the binding that we made to check for X errors. */ |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7576 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7577 static Lisp_Object |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7578 x_catch_errors_unwind (old_val) |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7579 Lisp_Object old_val; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7580 { |
|
49054
6b6ac8aa78d2
(x_catch_errors): Save dpy using make_save_value.
Richard M. Stallman <rms@gnu.org>
parents:
48383
diff
changeset
|
7581 Lisp_Object first; |
|
6b6ac8aa78d2
(x_catch_errors): Save dpy using make_save_value.
Richard M. Stallman <rms@gnu.org>
parents:
48383
diff
changeset
|
7582 |
|
6b6ac8aa78d2
(x_catch_errors): Save dpy using make_save_value.
Richard M. Stallman <rms@gnu.org>
parents:
48383
diff
changeset
|
7583 first = XCAR (old_val); |
|
6b6ac8aa78d2
(x_catch_errors): Save dpy using make_save_value.
Richard M. Stallman <rms@gnu.org>
parents:
48383
diff
changeset
|
7584 |
|
6b6ac8aa78d2
(x_catch_errors): Save dpy using make_save_value.
Richard M. Stallman <rms@gnu.org>
parents:
48383
diff
changeset
|
7585 XSync (XSAVE_VALUE (first)->pointer, False); |
|
6b6ac8aa78d2
(x_catch_errors): Save dpy using make_save_value.
Richard M. Stallman <rms@gnu.org>
parents:
48383
diff
changeset
|
7586 |
|
6b6ac8aa78d2
(x_catch_errors): Save dpy using make_save_value.
Richard M. Stallman <rms@gnu.org>
parents:
48383
diff
changeset
|
7587 x_error_message_string = XCDR (old_val); |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7588 return Qnil; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7589 } |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7590 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7591 /* If any X protocol errors have arrived since the last call to |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7592 x_catch_errors or x_check_errors, signal an Emacs error using |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7593 sprintf (a buffer, FORMAT, the x error message text) as the text. */ |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7594 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7595 void |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7596 x_check_errors (dpy, format) |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7597 Display *dpy; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7598 char *format; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7599 { |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7600 /* Make sure to catch any errors incurred so far. */ |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7601 XSync (dpy, False); |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7602 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7603 if (SREF (x_error_message_string, 0)) |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7604 error (format, SDATA (x_error_message_string)); |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7605 } |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7606 |
|
17953
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
7607 /* Nonzero if we had any X protocol errors |
|
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
7608 since we did x_catch_errors on DPY. */ |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7609 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7610 int |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7611 x_had_errors_p (dpy) |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7612 Display *dpy; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7613 { |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7614 /* Make sure to catch any errors incurred so far. */ |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7615 XSync (dpy, False); |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7616 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7617 return SREF (x_error_message_string, 0) != 0; |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7618 } |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7619 |
|
17953
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
7620 /* Forget about any errors we have had, since we did x_catch_errors on DPY. */ |
|
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
7621 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7622 void |
|
17953
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
7623 x_clear_errors (dpy) |
|
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
7624 Display *dpy; |
|
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
7625 { |
|
46435
278371336b60
* xterm.c (x_catch_errors, x_clear_errors): Use SSET.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
7626 SSET (x_error_message_string, 0, 0); |
|
17953
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
7627 } |
|
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
7628 |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7629 /* Stop catching X protocol errors and let them make Emacs die. |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7630 DPY should be the display that was passed to x_catch_errors. |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7631 COUNT should be the value that was returned by |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7632 the corresponding call to x_catch_errors. */ |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7633 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7634 void |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7635 x_uncatch_errors (dpy, count) |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7636 Display *dpy; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7637 int count; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7638 { |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7639 unbind_to (count, Qnil); |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7640 } |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7641 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7642 #if 0 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7643 static unsigned int x_wire_count; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7644 x_trace_wire () |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7645 { |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7646 fprintf (stderr, "Lib call: %d\n", ++x_wire_count); |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7647 } |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7648 #endif /* ! 0 */ |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7649 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7650 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7651 /* Handle SIGPIPE, which can happen when the connection to a server |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7652 simply goes away. SIGPIPE is handled by x_connection_signal. |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7653 Don't need to do anything, because the write which caused the |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7654 SIGPIPE will fail, causing Xlib to invoke the X IO error handler, |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7655 which will do the appropriate cleanup for us. */ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7656 |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7657 static SIGTYPE |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7658 x_connection_signal (signalnum) /* If we don't have an argument, */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7659 int signalnum; /* some compilers complain in signal calls. */ |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7660 { |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7661 #ifdef USG |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7662 /* USG systems forget handlers when they are used; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7663 must reestablish each time */ |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7664 signal (signalnum, x_connection_signal); |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7665 #endif /* USG */ |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7666 } |
|
34956
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7667 |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7668 |
|
34956
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7669 /************************************************************************ |
|
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7670 Handling X errors |
|
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7671 ************************************************************************/ |
|
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7672 |
|
39586
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7673 /* Error message passed to x_connection_closed. */ |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7674 |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7675 static char *error_msg; |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7676 |
| 40370 | 7677 /* Function installed as fatal_error_signal_hook in |
|
39586
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7678 x_connection_closed. Print the X error message, and exit normally, |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7679 instead of dumping core when XtCloseDisplay fails. */ |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7680 |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7681 static void |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7682 x_fatal_error_signal () |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7683 { |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7684 fprintf (stderr, "%s\n", error_msg); |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7685 exit (70); |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7686 } |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7687 |
|
34956
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7688 /* Handle the loss of connection to display DPY. ERROR_MESSAGE is |
|
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7689 the text of an error message that lead to the connection loss. */ |
|
1020
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
7690 |
| 621 | 7691 static SIGTYPE |
|
34673
77cda2c018e5
(x_connection_closed): Prevent being called recursively
Gerd Moellmann <gerd@gnu.org>
parents:
34621
diff
changeset
|
7692 x_connection_closed (dpy, error_message) |
|
77cda2c018e5
(x_connection_closed): Prevent being called recursively
Gerd Moellmann <gerd@gnu.org>
parents:
34621
diff
changeset
|
7693 Display *dpy; |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7694 char *error_message; |
| 621 | 7695 { |
|
34673
77cda2c018e5
(x_connection_closed): Prevent being called recursively
Gerd Moellmann <gerd@gnu.org>
parents:
34621
diff
changeset
|
7696 struct x_display_info *dpyinfo = x_display_info_for_display (dpy); |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7697 Lisp_Object frame, tail; |
|
34956
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7698 int count; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7699 |
|
39586
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7700 error_msg = (char *) alloca (strlen (error_message) + 1); |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7701 strcpy (error_msg, error_message); |
|
34949
bbd0e7b5043a
(x_connection_closed): Set handling_signal to 0 at
Gerd Moellmann <gerd@gnu.org>
parents:
34869
diff
changeset
|
7702 handling_signal = 0; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7703 |
|
34956
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7704 /* Prevent being called recursively because of an error condition |
|
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7705 below. Otherwise, we might end up with printing ``can't find per |
|
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7706 display information'' in the recursive call instead of printing |
|
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7707 the original message here. */ |
|
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7708 count = x_catch_errors (dpy); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7709 |
| 34213 | 7710 /* We have to close the display to inform Xt that it doesn't |
| 7711 exist anymore. If we don't, Xt will continue to wait for | |
| 7712 events from the display. As a consequence, a sequence of | |
| 7713 | |
| 7714 M-x make-frame-on-display RET :1 RET | |
| 7715 ...kill the new frame, so that we get an IO error... | |
| 7716 M-x make-frame-on-display RET :1 RET | |
| 7717 | |
| 7718 will indefinitely wait in Xt for events for display `:1', opened | |
| 7719 in the first class to make-frame-on-display. | |
| 7720 | |
| 7721 Closing the display is reported to lead to a bus error on | |
| 7722 OpenWindows in certain situations. I suspect that is a bug | |
| 7723 in OpenWindows. I don't know how to cicumvent it here. */ | |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7724 |
|
17825
281d99590839
(dumpglyphs): Draw glyphs one by one if the font for
Kenichi Handa <handa@m17n.org>
parents:
17720
diff
changeset
|
7725 #ifdef USE_X_TOOLKIT |
|
35309
cb7e1d7b6b67
(x_connection_closed) [USE_X_TOOLKIT]: If
Gerd Moellmann <gerd@gnu.org>
parents:
35276
diff
changeset
|
7726 /* If DPYINFO is null, this means we didn't open the display |
|
cb7e1d7b6b67
(x_connection_closed) [USE_X_TOOLKIT]: If
Gerd Moellmann <gerd@gnu.org>
parents:
35276
diff
changeset
|
7727 in the first place, so don't try to close it. */ |
|
cb7e1d7b6b67
(x_connection_closed) [USE_X_TOOLKIT]: If
Gerd Moellmann <gerd@gnu.org>
parents:
35276
diff
changeset
|
7728 if (dpyinfo) |
|
39586
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7729 { |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7730 extern void (*fatal_error_signal_hook) P_ ((void)); |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7731 fatal_error_signal_hook = x_fatal_error_signal; |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7732 XtCloseDisplay (dpy); |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7733 fatal_error_signal_hook = NULL; |
|
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7734 } |
|
17825
281d99590839
(dumpglyphs): Draw glyphs one by one if the font for
Kenichi Handa <handa@m17n.org>
parents:
17720
diff
changeset
|
7735 #endif |
| 34213 | 7736 |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7737 #ifdef USE_GTK |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7738 if (dpyinfo) |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7739 xg_display_close (dpyinfo->display); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7740 #endif |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
7741 |
| 34213 | 7742 /* Indicate that this display is dead. */ |
|
29536
4def8a9e785a
* xterm.c (x_connection_closed): If dpyinfo is NULL, don't try to
Ken Raeburn <raeburn@raeburn.org>
parents:
29512
diff
changeset
|
7743 if (dpyinfo) |
|
4def8a9e785a
* xterm.c (x_connection_closed): If dpyinfo is NULL, don't try to
Ken Raeburn <raeburn@raeburn.org>
parents:
29512
diff
changeset
|
7744 dpyinfo->display = 0; |
|
14489
9bc700f13f97
(x_connection_signal): Call x_connection_closed properly.
Richard M. Stallman <rms@gnu.org>
parents:
14411
diff
changeset
|
7745 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7746 /* First delete frames whose mini-buffers are on frames |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7747 that are on the dead display. */ |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7748 FOR_EACH_FRAME (tail, frame) |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7749 { |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7750 Lisp_Object minibuf_frame; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7751 minibuf_frame |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7752 = WINDOW_FRAME (XWINDOW (FRAME_MINIBUF_WINDOW (XFRAME (frame)))); |
|
10921
bf33c9179a6b
(x_connection_closed): Ignore non-X frames.
Richard M. Stallman <rms@gnu.org>
parents:
10755
diff
changeset
|
7753 if (FRAME_X_P (XFRAME (frame)) |
|
bf33c9179a6b
(x_connection_closed): Ignore non-X frames.
Richard M. Stallman <rms@gnu.org>
parents:
10755
diff
changeset
|
7754 && FRAME_X_P (XFRAME (minibuf_frame)) |
|
bf33c9179a6b
(x_connection_closed): Ignore non-X frames.
Richard M. Stallman <rms@gnu.org>
parents:
10755
diff
changeset
|
7755 && ! EQ (frame, minibuf_frame) |
|
bf33c9179a6b
(x_connection_closed): Ignore non-X frames.
Richard M. Stallman <rms@gnu.org>
parents:
10755
diff
changeset
|
7756 && FRAME_X_DISPLAY_INFO (XFRAME (minibuf_frame)) == dpyinfo) |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7757 Fdelete_frame (frame, Qt); |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7758 } |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7759 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7760 /* Now delete all remaining frames on the dead display. |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7761 We are now sure none of these is used as the mini-buffer |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7762 for another frame that we need to delete. */ |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7763 FOR_EACH_FRAME (tail, frame) |
|
10921
bf33c9179a6b
(x_connection_closed): Ignore non-X frames.
Richard M. Stallman <rms@gnu.org>
parents:
10755
diff
changeset
|
7764 if (FRAME_X_P (XFRAME (frame)) |
|
bf33c9179a6b
(x_connection_closed): Ignore non-X frames.
Richard M. Stallman <rms@gnu.org>
parents:
10755
diff
changeset
|
7765 && FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo) |
|
11904
0d37c1e81c0d
(x_connection_closed): Unblock input, first thing.
Karl Heuer <kwzh@gnu.org>
parents:
11901
diff
changeset
|
7766 { |
|
0d37c1e81c0d
(x_connection_closed): Unblock input, first thing.
Karl Heuer <kwzh@gnu.org>
parents:
11901
diff
changeset
|
7767 /* Set this to t so that Fdelete_frame won't get confused |
|
0d37c1e81c0d
(x_connection_closed): Unblock input, first thing.
Karl Heuer <kwzh@gnu.org>
parents:
11901
diff
changeset
|
7768 trying to find a replacement. */ |
|
0d37c1e81c0d
(x_connection_closed): Unblock input, first thing.
Karl Heuer <kwzh@gnu.org>
parents:
11901
diff
changeset
|
7769 FRAME_KBOARD (XFRAME (frame))->Vdefault_minibuffer_frame = Qt; |
|
0d37c1e81c0d
(x_connection_closed): Unblock input, first thing.
Karl Heuer <kwzh@gnu.org>
parents:
11901
diff
changeset
|
7770 Fdelete_frame (frame, Qt); |
|
0d37c1e81c0d
(x_connection_closed): Unblock input, first thing.
Karl Heuer <kwzh@gnu.org>
parents:
11901
diff
changeset
|
7771 } |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7772 |
|
13727
9eb09adbcb38
(x_connection_closed): Don't delete dpyinfo if it's null.
Karl Heuer <kwzh@gnu.org>
parents:
13633
diff
changeset
|
7773 if (dpyinfo) |
|
9eb09adbcb38
(x_connection_closed): Don't delete dpyinfo if it's null.
Karl Heuer <kwzh@gnu.org>
parents:
13633
diff
changeset
|
7774 x_delete_display (dpyinfo); |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7775 |
|
34956
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7776 x_uncatch_errors (dpy, count); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7777 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7778 if (x_display_list == 0) |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7779 { |
|
39586
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7780 fprintf (stderr, "%s\n", error_msg); |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7781 shut_down_emacs (0, 0, Qnil); |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7782 exit (70); |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7783 } |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7784 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7785 /* Ordinary stack unwind doesn't deal with these. */ |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7786 #ifdef SIGIO |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7787 sigunblock (sigmask (SIGIO)); |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7788 #endif |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7789 sigunblock (sigmask (SIGALRM)); |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7790 TOTALLY_UNBLOCK_INPUT; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7791 |
|
15526
926ef4afc174
(x_connection_closed): Call clear_waiting_for_input.
Richard M. Stallman <rms@gnu.org>
parents:
15521
diff
changeset
|
7792 clear_waiting_for_input (); |
|
39586
2ca67ed01cd8
(XTread_socket): Return a non_ascii_keystroke for
Gerd Moellmann <gerd@gnu.org>
parents:
39474
diff
changeset
|
7793 error ("%s", error_msg); |
|
34956
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7794 } |
|
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7795 |
| 621 | 7796 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7797 /* This is the usual handler for X protocol errors. |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7798 It kills all frames on the display that we got the error for. |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7799 If that was the only one, it prints an error message and kills Emacs. */ |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7800 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7801 static void |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7802 x_error_quitter (display, error) |
|
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7803 Display *display; |
|
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7804 XErrorEvent *error; |
|
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7805 { |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7806 char buf[256], buf1[356]; |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7807 |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
7808 /* Note that there is no real way portable across R3/R4 to get the |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7809 original error handler. */ |
|
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7810 |
|
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7811 XGetErrorText (display, error->error_code, buf, sizeof (buf)); |
|
15521
2b61a33a4576
(x_error_quitter): Delete newline from sprintf string.
Richard M. Stallman <rms@gnu.org>
parents:
15519
diff
changeset
|
7812 sprintf (buf1, "X protocol error: %s on protocol request %d", |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7813 buf, error->request_code); |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7814 x_connection_closed (display, buf1); |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7815 } |
|
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7816 |
|
34956
c26b7651dd9f
(x_connection_closed): Catch X errors around all
Gerd Moellmann <gerd@gnu.org>
parents:
34949
diff
changeset
|
7817 |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7818 /* This is the first-level handler for X protocol errors. |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7819 It calls x_error_quitter or x_error_catcher. */ |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7820 |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7821 static int |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7822 x_error_handler (display, error) |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7823 Display *display; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7824 XErrorEvent *error; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7825 { |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7826 if (! NILP (x_error_message_string)) |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7827 x_error_catcher (display, error); |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7828 else |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7829 x_error_quitter (display, error); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7830 return 0; |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7831 } |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
7832 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7833 /* This is the handler for X IO errors, always. |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7834 It kills all frames on the display that we lost touch with. |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7835 If that was the only one, it prints an error message and kills Emacs. */ |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7836 |
|
1875
f569bc4e9b8f
* xterm.c (x_set_window_size): Call change_frame_size instead of
Jim Blandy <jimb@redhat.com>
parents:
1841
diff
changeset
|
7837 static int |
|
f569bc4e9b8f
* xterm.c (x_set_window_size): Call change_frame_size instead of
Jim Blandy <jimb@redhat.com>
parents:
1841
diff
changeset
|
7838 x_io_error_quitter (display) |
|
f569bc4e9b8f
* xterm.c (x_set_window_size): Call change_frame_size instead of
Jim Blandy <jimb@redhat.com>
parents:
1841
diff
changeset
|
7839 Display *display; |
|
f569bc4e9b8f
* xterm.c (x_set_window_size): Call change_frame_size instead of
Jim Blandy <jimb@redhat.com>
parents:
1841
diff
changeset
|
7840 { |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7841 char buf[256]; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7842 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7843 sprintf (buf, "Connection lost to X server `%s'", DisplayString (display)); |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7844 x_connection_closed (display, buf); |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
7845 return 0; |
|
1875
f569bc4e9b8f
* xterm.c (x_set_window_size): Call change_frame_size instead of
Jim Blandy <jimb@redhat.com>
parents:
1841
diff
changeset
|
7846 } |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
7847 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
7848 /* Changing the font of the frame. */ |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
7849 |
|
8291
9c6ddd14996b
(struct font_info): New field full_name.
Richard M. Stallman <rms@gnu.org>
parents:
8279
diff
changeset
|
7850 /* Give frame F the font named FONTNAME as its default font, and |
|
9c6ddd14996b
(struct font_info): New field full_name.
Richard M. Stallman <rms@gnu.org>
parents:
8279
diff
changeset
|
7851 return the full name of that font. FONTNAME may be a wildcard |
|
9c6ddd14996b
(struct font_info): New field full_name.
Richard M. Stallman <rms@gnu.org>
parents:
8279
diff
changeset
|
7852 pattern; in that case, we choose some font that fits the pattern. |
|
9c6ddd14996b
(struct font_info): New field full_name.
Richard M. Stallman <rms@gnu.org>
parents:
8279
diff
changeset
|
7853 The return value shows which font we chose. */ |
|
9c6ddd14996b
(struct font_info): New field full_name.
Richard M. Stallman <rms@gnu.org>
parents:
8279
diff
changeset
|
7854 |
|
3076
e3b3c67cf203
Arrange for font names to get fully resolved - no wildcards.
Jim Blandy <jimb@redhat.com>
parents:
3066
diff
changeset
|
7855 Lisp_Object |
| 771 | 7856 x_new_font (f, fontname) |
| 7857 struct frame *f; | |
| 286 | 7858 register char *fontname; |
| 7859 { | |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7860 struct font_info *fontp |
|
28231
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
7861 = FS_LOAD_FONT (f, 0, fontname, -1); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7862 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7863 if (!fontp) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7864 return Qnil; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7865 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7866 FRAME_FONT (f) = (XFontStruct *) (fontp->font); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7867 FRAME_BASELINE_OFFSET (f) = fontp->baseline_offset; |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7868 FRAME_FONTSET (f) = -1; |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7869 |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7870 FRAME_COLUMN_WIDTH (f) = FONT_WIDTH (FRAME_FONT (f)); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7871 FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (FRAME_FONT (f)); |
|
41721
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
7872 |
| 50097 | 7873 compute_fringe_widths (f, 1); |
|
41721
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
7874 |
|
9167
8ad448b29c1c
(x_new_font): New rule for computing column width. Factored out common code.
Karl Heuer <kwzh@gnu.org>
parents:
9101
diff
changeset
|
7875 /* Compute the scroll bar width in character columns. */ |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7876 if (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) > 0) |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7877 { |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7878 int wid = FRAME_COLUMN_WIDTH (f); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7879 FRAME_CONFIG_SCROLL_BAR_COLS (f) |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7880 = (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) + wid-1) / wid; |
|
9167
8ad448b29c1c
(x_new_font): New rule for computing column width. Factored out common code.
Karl Heuer <kwzh@gnu.org>
parents:
9101
diff
changeset
|
7881 } |
|
8ad448b29c1c
(x_new_font): New rule for computing column width. Factored out common code.
Karl Heuer <kwzh@gnu.org>
parents:
9101
diff
changeset
|
7882 else |
|
19027
1171ca6f0281
(x_new_font): Follow the change in x_set_scroll_bar_width and make the
Richard M. Stallman <rms@gnu.org>
parents:
19021
diff
changeset
|
7883 { |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7884 int wid = FRAME_COLUMN_WIDTH (f); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7885 FRAME_CONFIG_SCROLL_BAR_COLS (f) = (14 + wid - 1) / wid; |
|
19027
1171ca6f0281
(x_new_font): Follow the change in x_set_scroll_bar_width and make the
Richard M. Stallman <rms@gnu.org>
parents:
19021
diff
changeset
|
7886 } |
|
9167
8ad448b29c1c
(x_new_font): New rule for computing column width. Factored out common code.
Karl Heuer <kwzh@gnu.org>
parents:
9101
diff
changeset
|
7887 |
| 771 | 7888 /* Now make the frame display the given font. */ |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
7889 if (FRAME_X_WINDOW (f) != 0) |
| 286 | 7890 { |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
7891 XSetFont (FRAME_X_DISPLAY (f), f->output_data.x->normal_gc, |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7892 FRAME_FONT (f)->fid); |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
7893 XSetFont (FRAME_X_DISPLAY (f), f->output_data.x->reverse_gc, |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7894 FRAME_FONT (f)->fid); |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
7895 XSetFont (FRAME_X_DISPLAY (f), f->output_data.x->cursor_gc, |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7896 FRAME_FONT (f)->fid); |
|
35506
5ad77d538e08
(x_new_font): Don't change a tooltip's size.
Gerd Moellmann <gerd@gnu.org>
parents:
35487
diff
changeset
|
7897 |
|
5ad77d538e08
(x_new_font): Don't change a tooltip's size.
Gerd Moellmann <gerd@gnu.org>
parents:
35487
diff
changeset
|
7898 /* Don't change the size of a tip frame; there's no point in |
|
5ad77d538e08
(x_new_font): Don't change a tooltip's size.
Gerd Moellmann <gerd@gnu.org>
parents:
35487
diff
changeset
|
7899 doing it because it's done in Fx_show_tip, and it leads to |
|
5ad77d538e08
(x_new_font): Don't change a tooltip's size.
Gerd Moellmann <gerd@gnu.org>
parents:
35487
diff
changeset
|
7900 problems because the tip frame has no widget. */ |
|
5ad77d538e08
(x_new_font): Don't change a tooltip's size.
Gerd Moellmann <gerd@gnu.org>
parents:
35487
diff
changeset
|
7901 if (NILP (tip_frame) || XFRAME (tip_frame) != f) |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7902 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7903 } |
| 286 | 7904 |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7905 return build_string (fontp->full_name); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7906 } |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7907 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7908 /* Give frame F the fontset named FONTSETNAME as its default font, and |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7909 return the full name of that fontset. FONTSETNAME may be a wildcard |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
7910 pattern; in that case, we choose some fontset that fits the pattern. |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
7911 The return value shows which fontset we chose. */ |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7912 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7913 Lisp_Object |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7914 x_new_fontset (f, fontsetname) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7915 struct frame *f; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7916 char *fontsetname; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7917 { |
|
28231
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
7918 int fontset = fs_query_fontset (build_string (fontsetname), 0); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7919 Lisp_Object result; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7920 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7921 if (fontset < 0) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7922 return Qnil; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7923 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7924 if (FRAME_FONTSET (f) == fontset) |
|
18347
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
7925 /* This fontset is already set in frame F. There's nothing more |
|
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
7926 to do. */ |
|
28231
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
7927 return fontset_name (fontset); |
|
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
7928 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7929 result = x_new_font (f, (SDATA (fontset_ascii (fontset)))); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7930 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7931 if (!STRINGP (result)) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7932 /* Can't load ASCII font. */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7933 return Qnil; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7934 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7935 /* Since x_new_font doesn't update any fontset information, do it now. */ |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
7936 FRAME_FONTSET (f) = fontset; |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7937 |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7938 #ifdef HAVE_X_I18N |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7939 if (FRAME_XIC (f) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7940 && (FRAME_XIC_STYLE (f) & (XIMPreeditPosition | XIMStatusArea))) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
7941 xic_set_xfontset (f, SDATA (fontset_ascii (fontset))); |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7942 #endif |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7943 |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
7944 return build_string (fontsetname); |
| 286 | 7945 } |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7946 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7947 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7948 /*********************************************************************** |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7949 X Input Methods |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7950 ***********************************************************************/ |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7951 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7952 #ifdef HAVE_X_I18N |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7953 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7954 #ifdef HAVE_X11R6 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7955 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7956 /* XIM destroy callback function, which is called whenever the |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7957 connection to input method XIM dies. CLIENT_DATA contains a |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7958 pointer to the x_display_info structure corresponding to XIM. */ |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7959 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7960 static void |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7961 xim_destroy_callback (xim, client_data, call_data) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7962 XIM xim; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7963 XPointer client_data; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7964 XPointer call_data; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7965 { |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7966 struct x_display_info *dpyinfo = (struct x_display_info *) client_data; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7967 Lisp_Object frame, tail; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7968 |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7969 BLOCK_INPUT; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7970 |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7971 /* No need to call XDestroyIC.. */ |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7972 FOR_EACH_FRAME (tail, frame) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7973 { |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7974 struct frame *f = XFRAME (frame); |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7975 if (FRAME_X_DISPLAY_INFO (f) == dpyinfo) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7976 { |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7977 FRAME_XIC (f) = NULL; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7978 if (FRAME_XIC_FONTSET (f)) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7979 { |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7980 XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f)); |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7981 FRAME_XIC_FONTSET (f) = NULL; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7982 } |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7983 } |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7984 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
7985 |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7986 /* No need to call XCloseIM. */ |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7987 dpyinfo->xim = NULL; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7988 XFree (dpyinfo->xim_styles); |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7989 UNBLOCK_INPUT; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7990 } |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7991 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7992 #endif /* HAVE_X11R6 */ |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7993 |
| 48085 | 7994 #ifdef HAVE_X11R6 |
| 7995 /* This isn't prototyped in OSF 5.0 or 5.1a. */ | |
| 7996 extern char *XSetIMValues P_ ((XIM, ...)); | |
| 7997 #endif | |
| 7998 | |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
7999 /* Open the connection to the XIM server on display DPYINFO. |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8000 RESOURCE_NAME is the resource name Emacs uses. */ |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8001 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8002 static void |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8003 xim_open_dpy (dpyinfo, resource_name) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8004 struct x_display_info *dpyinfo; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8005 char *resource_name; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8006 { |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8007 XIM xim; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8008 |
|
52076
039e1c55561e
(xim_open_dpy, xim_initialize, xim_close_dpy):
Richard M. Stallman <rms@gnu.org>
parents:
51953
diff
changeset
|
8009 #ifdef HAVE_XIM |
| 51129 | 8010 if (use_xim) |
| 8011 { | |
| 8012 xim = XOpenIM (dpyinfo->display, dpyinfo->xrdb, resource_name, | |
| 8013 EMACS_CLASS); | |
| 8014 dpyinfo->xim = xim; | |
| 8015 | |
| 8016 if (xim) | |
| 8017 { | |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8018 #ifdef HAVE_X11R6 |
| 51129 | 8019 XIMCallback destroy; |
| 8020 #endif | |
| 8021 | |
| 8022 /* Get supported styles and XIM values. */ | |
| 8023 XGetIMValues (xim, XNQueryInputStyle, &dpyinfo->xim_styles, NULL); | |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8024 |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8025 #ifdef HAVE_X11R6 |
| 51129 | 8026 destroy.callback = xim_destroy_callback; |
| 8027 destroy.client_data = (XPointer)dpyinfo; | |
| 8028 XSetIMValues (xim, XNDestroyCallback, &destroy, NULL); | |
| 8029 #endif | |
| 8030 } | |
| 8031 } | |
| 8032 | |
| 8033 else | |
|
52076
039e1c55561e
(xim_open_dpy, xim_initialize, xim_close_dpy):
Richard M. Stallman <rms@gnu.org>
parents:
51953
diff
changeset
|
8034 #endif /* HAVE_XIM */ |
| 51129 | 8035 dpyinfo->xim = NULL; |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8036 } |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8037 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8038 |
|
28142
156c32f18198
(xim_close_dpy, xim_initialize): Use X11R6-style XIM
Gerd Moellmann <gerd@gnu.org>
parents:
28139
diff
changeset
|
8039 #ifdef HAVE_X11R6_XIM |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8040 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8041 struct xim_inst_t |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8042 { |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8043 struct x_display_info *dpyinfo; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8044 char *resource_name; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8045 }; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8046 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8047 /* XIM instantiate callback function, which is called whenever an XIM |
|
49434
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
8048 server is available. DISPLAY is the display of the XIM. |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8049 CLIENT_DATA contains a pointer to an xim_inst_t structure created |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8050 when the callback was registered. */ |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8051 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8052 static void |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8053 xim_instantiate_callback (display, client_data, call_data) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8054 Display *display; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8055 XPointer client_data; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8056 XPointer call_data; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8057 { |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8058 struct xim_inst_t *xim_inst = (struct xim_inst_t *) client_data; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8059 struct x_display_info *dpyinfo = xim_inst->dpyinfo; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8060 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8061 /* We don't support multiple XIM connections. */ |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8062 if (dpyinfo->xim) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8063 return; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8064 |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8065 xim_open_dpy (dpyinfo, xim_inst->resource_name); |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8066 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8067 /* Create XIC for the existing frames on the same display, as long |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8068 as they have no XIC. */ |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8069 if (dpyinfo->xim && dpyinfo->reference_count > 0) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8070 { |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8071 Lisp_Object tail, frame; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8072 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8073 BLOCK_INPUT; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8074 FOR_EACH_FRAME (tail, frame) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8075 { |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8076 struct frame *f = XFRAME (frame); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8077 |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8078 if (FRAME_X_DISPLAY_INFO (f) == xim_inst->dpyinfo) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8079 if (FRAME_XIC (f) == NULL) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8080 { |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8081 create_frame_xic (f); |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8082 if (FRAME_XIC_STYLE (f) & XIMStatusArea) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8083 xic_set_statusarea (f); |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8084 if (FRAME_XIC_STYLE (f) & XIMPreeditPosition) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8085 { |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8086 struct window *w = XWINDOW (f->selected_window); |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8087 xic_set_preeditarea (w, w->cursor.x, w->cursor.y); |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8088 } |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8089 } |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8090 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8091 |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8092 UNBLOCK_INPUT; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8093 } |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8094 } |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8095 |
|
28142
156c32f18198
(xim_close_dpy, xim_initialize): Use X11R6-style XIM
Gerd Moellmann <gerd@gnu.org>
parents:
28139
diff
changeset
|
8096 #endif /* HAVE_X11R6_XIM */ |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8097 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8098 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8099 /* Open a connection to the XIM server on display DPYINFO. |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8100 RESOURCE_NAME is the resource name for Emacs. On X11R5, open the |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8101 connection only at the first time. On X11R6, open the connection |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8102 in the XIM instantiate callback function. */ |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8103 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8104 static void |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8105 xim_initialize (dpyinfo, resource_name) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8106 struct x_display_info *dpyinfo; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8107 char *resource_name; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8108 { |
|
52076
039e1c55561e
(xim_open_dpy, xim_initialize, xim_close_dpy):
Richard M. Stallman <rms@gnu.org>
parents:
51953
diff
changeset
|
8109 #ifdef HAVE_XIM |
| 51129 | 8110 if (use_xim) |
| 8111 { | |
|
28142
156c32f18198
(xim_close_dpy, xim_initialize): Use X11R6-style XIM
Gerd Moellmann <gerd@gnu.org>
parents:
28139
diff
changeset
|
8112 #ifdef HAVE_X11R6_XIM |
| 51129 | 8113 struct xim_inst_t *xim_inst; |
| 8114 int len; | |
| 8115 | |
| 8116 dpyinfo->xim = NULL; | |
| 8117 xim_inst = (struct xim_inst_t *) xmalloc (sizeof (struct xim_inst_t)); | |
| 8118 xim_inst->dpyinfo = dpyinfo; | |
| 8119 len = strlen (resource_name); | |
| 8120 xim_inst->resource_name = (char *) xmalloc (len + 1); | |
| 8121 bcopy (resource_name, xim_inst->resource_name, len + 1); | |
| 8122 XRegisterIMInstantiateCallback (dpyinfo->display, dpyinfo->xrdb, | |
| 8123 resource_name, EMACS_CLASS, | |
| 8124 xim_instantiate_callback, | |
|
51649
fab11a57338c
(xim_initialize): Use XRegisterIMInstantiateCallback_arg6.
Dave Love <fx@gnu.org>
parents:
51576
diff
changeset
|
8125 /* This is XPointer in XFree86 |
|
fab11a57338c
(xim_initialize): Use XRegisterIMInstantiateCallback_arg6.
Dave Love <fx@gnu.org>
parents:
51576
diff
changeset
|
8126 but (XPointer *) on Tru64, at |
|
fab11a57338c
(xim_initialize): Use XRegisterIMInstantiateCallback_arg6.
Dave Love <fx@gnu.org>
parents:
51576
diff
changeset
|
8127 least, hence the configure test. */ |
|
51953
610a102ed36c
(xim_initialize): Redo 6/24 change.
Richard M. Stallman <rms@gnu.org>
parents:
51897
diff
changeset
|
8128 (XRegisterIMInstantiateCallback_arg6) xim_inst); |
|
28142
156c32f18198
(xim_close_dpy, xim_initialize): Use X11R6-style XIM
Gerd Moellmann <gerd@gnu.org>
parents:
28139
diff
changeset
|
8129 #else /* not HAVE_X11R6_XIM */ |
| 51129 | 8130 dpyinfo->xim = NULL; |
| 8131 xim_open_dpy (dpyinfo, resource_name); | |
|
28142
156c32f18198
(xim_close_dpy, xim_initialize): Use X11R6-style XIM
Gerd Moellmann <gerd@gnu.org>
parents:
28139
diff
changeset
|
8132 #endif /* not HAVE_X11R6_XIM */ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8133 |
| 51129 | 8134 } |
| 8135 else | |
|
52076
039e1c55561e
(xim_open_dpy, xim_initialize, xim_close_dpy):
Richard M. Stallman <rms@gnu.org>
parents:
51953
diff
changeset
|
8136 #endif /* HAVE_XIM */ |
| 51129 | 8137 dpyinfo->xim = NULL; |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8138 } |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8139 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8140 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8141 /* Close the connection to the XIM server on display DPYINFO. */ |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8142 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8143 static void |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8144 xim_close_dpy (dpyinfo) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8145 struct x_display_info *dpyinfo; |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8146 { |
|
52076
039e1c55561e
(xim_open_dpy, xim_initialize, xim_close_dpy):
Richard M. Stallman <rms@gnu.org>
parents:
51953
diff
changeset
|
8147 #ifdef HAVE_XIM |
| 51129 | 8148 if (use_xim) |
| 8149 { | |
|
28142
156c32f18198
(xim_close_dpy, xim_initialize): Use X11R6-style XIM
Gerd Moellmann <gerd@gnu.org>
parents:
28139
diff
changeset
|
8150 #ifdef HAVE_X11R6_XIM |
| 51129 | 8151 if (dpyinfo->display) |
| 8152 XUnregisterIMInstantiateCallback (dpyinfo->display, dpyinfo->xrdb, | |
| 8153 NULL, EMACS_CLASS, | |
| 8154 xim_instantiate_callback, NULL); | |
|
28142
156c32f18198
(xim_close_dpy, xim_initialize): Use X11R6-style XIM
Gerd Moellmann <gerd@gnu.org>
parents:
28139
diff
changeset
|
8155 #endif /* not HAVE_X11R6_XIM */ |
| 51129 | 8156 if (dpyinfo->display) |
| 8157 XCloseIM (dpyinfo->xim); | |
| 8158 dpyinfo->xim = NULL; | |
| 8159 XFree (dpyinfo->xim_styles); | |
| 8160 } | |
|
52076
039e1c55561e
(xim_open_dpy, xim_initialize, xim_close_dpy):
Richard M. Stallman <rms@gnu.org>
parents:
51953
diff
changeset
|
8161 #endif /* HAVE_XIM */ |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8162 } |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8163 |
|
28142
156c32f18198
(xim_close_dpy, xim_initialize): Use X11R6-style XIM
Gerd Moellmann <gerd@gnu.org>
parents:
28139
diff
changeset
|
8164 #endif /* not HAVE_X11R6_XIM */ |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8165 |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8166 |
| 286 | 8167 |
|
14826
eec0abb31126
Comment/whitespace change.
Richard M. Stallman <rms@gnu.org>
parents:
14801
diff
changeset
|
8168 /* Calculate the absolute position in frame F |
|
eec0abb31126
Comment/whitespace change.
Richard M. Stallman <rms@gnu.org>
parents:
14801
diff
changeset
|
8169 from its current recorded position values and gravity. */ |
|
eec0abb31126
Comment/whitespace change.
Richard M. Stallman <rms@gnu.org>
parents:
14801
diff
changeset
|
8170 |
| 21514 | 8171 void |
|
7264
a701bffa0f9d
(x_calc_absolute_position): Use size_hint_flags.
Richard M. Stallman <rms@gnu.org>
parents:
7262
diff
changeset
|
8172 x_calc_absolute_position (f) |
| 771 | 8173 struct frame *f; |
| 286 | 8174 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
8175 Window child; |
|
4630
70247ce8b381
(x_wm_set_size_hint): New args spec_x and spec_y.
Richard M. Stallman <rms@gnu.org>
parents:
4493
diff
changeset
|
8176 int win_x = 0, win_y = 0; |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8177 int flags = f->size_hint_flags; |
|
11896
507a45c7e911
(x_calc_absolute_position): Use menubar_height field.
Karl Heuer <kwzh@gnu.org>
parents:
11807
diff
changeset
|
8178 |
|
17953
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
8179 /* We have nothing to do if the current position |
|
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
8180 is already for the top-left corner. */ |
|
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
8181 if (! ((flags & XNegative) || (flags & YNegative))) |
|
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
8182 return; |
|
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
8183 |
|
54185
f6e4e454800a
xfns.c (x_window): Fixed indentation
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54173
diff
changeset
|
8184 /* Find the offsets of the outside upper-left corner of |
|
17953
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
8185 the inner window, with respect to the outer window. |
|
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
8186 But do this only if we will need the results. */ |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
8187 if (f->output_data.x->parent_desc != FRAME_X_DISPLAY_INFO (f)->root_window) |
|
54185
f6e4e454800a
xfns.c (x_window): Fixed indentation
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54173
diff
changeset
|
8188 /* This is to get *_pixels_outer_diff. */ |
|
f6e4e454800a
xfns.c (x_window): Fixed indentation
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54173
diff
changeset
|
8189 x_real_positions (f, &win_x, &win_y); |
|
4630
70247ce8b381
(x_wm_set_size_hint): New args spec_x and spec_y.
Richard M. Stallman <rms@gnu.org>
parents:
4493
diff
changeset
|
8190 |
|
70247ce8b381
(x_wm_set_size_hint): New args spec_x and spec_y.
Richard M. Stallman <rms@gnu.org>
parents:
4493
diff
changeset
|
8191 /* Treat negative positions as relative to the leftmost bottommost |
|
70247ce8b381
(x_wm_set_size_hint): New args spec_x and spec_y.
Richard M. Stallman <rms@gnu.org>
parents:
4493
diff
changeset
|
8192 position that fits on the screen. */ |
|
7262
68fc80bf10df
(x_wm_set_size_hint): Don't try to handle negative positions.
Richard M. Stallman <rms@gnu.org>
parents:
7210
diff
changeset
|
8193 if (flags & XNegative) |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8194 f->left_pos = (FRAME_X_DISPLAY_INFO (f)->width |
|
54185
f6e4e454800a
xfns.c (x_window): Fixed indentation
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54173
diff
changeset
|
8195 - 2 * FRAME_X_OUTPUT (f)->x_pixels_outer_diff |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8196 - FRAME_PIXEL_WIDTH (f) |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8197 + f->left_pos); |
| 771 | 8198 |
|
34099
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8199 { |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8200 int height = FRAME_PIXEL_HEIGHT (f); |
|
34099
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8201 |
|
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8202 #if defined USE_X_TOOLKIT && defined USE_MOTIF |
|
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8203 /* Something is fishy here. When using Motif, starting Emacs with |
|
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8204 `-g -0-0', the frame appears too low by a few pixels. |
|
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8205 |
|
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8206 This seems to be so because initially, while Emacs is starting, |
|
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8207 the column widget's height and the frame's pixel height are |
|
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8208 different. The column widget's height is the right one. In |
|
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8209 later invocations, when Emacs is up, the frame's pixel height |
|
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8210 is right, though. |
|
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8211 |
|
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8212 It's not obvious where the initial small difference comes from. |
|
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8213 2000-12-01, gerd. */ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8214 |
|
34099
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8215 XtVaGetValues (f->output_data.x->column_widget, XtNheight, &height, NULL); |
|
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8216 #endif |
|
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8217 |
|
7262
68fc80bf10df
(x_wm_set_size_hint): Don't try to handle negative positions.
Richard M. Stallman <rms@gnu.org>
parents:
7210
diff
changeset
|
8218 if (flags & YNegative) |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8219 f->top_pos = (FRAME_X_DISPLAY_INFO (f)->height |
|
54185
f6e4e454800a
xfns.c (x_window): Fixed indentation
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54173
diff
changeset
|
8220 - FRAME_X_OUTPUT (f)->y_pixels_outer_diff |
|
f6e4e454800a
xfns.c (x_window): Fixed indentation
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54173
diff
changeset
|
8221 |
|
f6e4e454800a
xfns.c (x_window): Fixed indentation
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54173
diff
changeset
|
8222 /* Assume the window manager decorations are the same size on |
|
f6e4e454800a
xfns.c (x_window): Fixed indentation
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54173
diff
changeset
|
8223 three sides, i.e. left, right and bottom. This is to |
|
f6e4e454800a
xfns.c (x_window): Fixed indentation
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54173
diff
changeset
|
8224 compensate for the bottom part. */ |
|
f6e4e454800a
xfns.c (x_window): Fixed indentation
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
54173
diff
changeset
|
8225 - FRAME_X_OUTPUT (f)->x_pixels_outer_diff |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8226 - height |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8227 + f->top_pos); |
|
34099
06ab9f74a16b
(x_calc_absolute_position): Don't subtract menubar's
Gerd Moellmann <gerd@gnu.org>
parents:
34066
diff
changeset
|
8228 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8229 |
|
7409
fe56a02838ba
(x_set_offset): Set gravity and size hint
Richard M. Stallman <rms@gnu.org>
parents:
7346
diff
changeset
|
8230 /* The left_pos and top_pos |
|
fe56a02838ba
(x_set_offset): Set gravity and size hint
Richard M. Stallman <rms@gnu.org>
parents:
7346
diff
changeset
|
8231 are now relative to the top and left screen edges, |
|
fe56a02838ba
(x_set_offset): Set gravity and size hint
Richard M. Stallman <rms@gnu.org>
parents:
7346
diff
changeset
|
8232 so the flags should correspond. */ |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8233 f->size_hint_flags &= ~ (XNegative | YNegative); |
| 286 | 8234 } |
| 8235 | |
|
7409
fe56a02838ba
(x_set_offset): Set gravity and size hint
Richard M. Stallman <rms@gnu.org>
parents:
7346
diff
changeset
|
8236 /* CHANGE_GRAVITY is 1 when calling from Fset_frame_position, |
|
fe56a02838ba
(x_set_offset): Set gravity and size hint
Richard M. Stallman <rms@gnu.org>
parents:
7346
diff
changeset
|
8237 to really change the position, and 0 when calling from |
|
fe56a02838ba
(x_set_offset): Set gravity and size hint
Richard M. Stallman <rms@gnu.org>
parents:
7346
diff
changeset
|
8238 x_make_frame_visible (in that case, XOFF and YOFF are the current |
|
11988
a1ce6f699967
(x_set_offset): Distinguish CHANGE_GRAVITY < 0 case.
Karl Heuer <kwzh@gnu.org>
parents:
11953
diff
changeset
|
8239 position values). It is -1 when calling from x_set_frame_parameters, |
|
a1ce6f699967
(x_set_offset): Distinguish CHANGE_GRAVITY < 0 case.
Karl Heuer <kwzh@gnu.org>
parents:
11953
diff
changeset
|
8240 which means, do adjust for borders but don't change the gravity. */ |
|
7409
fe56a02838ba
(x_set_offset): Set gravity and size hint
Richard M. Stallman <rms@gnu.org>
parents:
7346
diff
changeset
|
8241 |
| 21514 | 8242 void |
|
6934
e0ab4f59004e
(dumpglyphs): When HL=2, check explicitly for using
Richard M. Stallman <rms@gnu.org>
parents:
6883
diff
changeset
|
8243 x_set_offset (f, xoff, yoff, change_gravity) |
| 771 | 8244 struct frame *f; |
| 286 | 8245 register int xoff, yoff; |
|
6934
e0ab4f59004e
(dumpglyphs): When HL=2, check explicitly for using
Richard M. Stallman <rms@gnu.org>
parents:
6883
diff
changeset
|
8246 int change_gravity; |
| 286 | 8247 { |
|
11901
8ecc60a02138
(x_set_offset): Add border_width when calling XMoveWindow.
Karl Heuer <kwzh@gnu.org>
parents:
11896
diff
changeset
|
8248 int modified_top, modified_left; |
|
8ecc60a02138
(x_set_offset): Add border_width when calling XMoveWindow.
Karl Heuer <kwzh@gnu.org>
parents:
11896
diff
changeset
|
8249 |
|
11988
a1ce6f699967
(x_set_offset): Distinguish CHANGE_GRAVITY < 0 case.
Karl Heuer <kwzh@gnu.org>
parents:
11953
diff
changeset
|
8250 if (change_gravity > 0) |
|
7409
fe56a02838ba
(x_set_offset): Set gravity and size hint
Richard M. Stallman <rms@gnu.org>
parents:
7346
diff
changeset
|
8251 { |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8252 f->top_pos = yoff; |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8253 f->left_pos = xoff; |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8254 f->size_hint_flags &= ~ (XNegative | YNegative); |
|
7409
fe56a02838ba
(x_set_offset): Set gravity and size hint
Richard M. Stallman <rms@gnu.org>
parents:
7346
diff
changeset
|
8255 if (xoff < 0) |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8256 f->size_hint_flags |= XNegative; |
|
7409
fe56a02838ba
(x_set_offset): Set gravity and size hint
Richard M. Stallman <rms@gnu.org>
parents:
7346
diff
changeset
|
8257 if (yoff < 0) |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8258 f->size_hint_flags |= YNegative; |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8259 f->win_gravity = NorthWestGravity; |
|
7409
fe56a02838ba
(x_set_offset): Set gravity and size hint
Richard M. Stallman <rms@gnu.org>
parents:
7346
diff
changeset
|
8260 } |
|
7264
a701bffa0f9d
(x_calc_absolute_position): Use size_hint_flags.
Richard M. Stallman <rms@gnu.org>
parents:
7262
diff
changeset
|
8261 x_calc_absolute_position (f); |
|
54650
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
8262 |
| 286 | 8263 BLOCK_INPUT; |
|
11915
e2ab839155e1
(XTflash): Use pointers as args to select.
Karl Heuer <kwzh@gnu.org>
parents:
11904
diff
changeset
|
8264 x_wm_set_size_hint (f, (long) 0, 0); |
|
7409
fe56a02838ba
(x_set_offset): Set gravity and size hint
Richard M. Stallman <rms@gnu.org>
parents:
7346
diff
changeset
|
8265 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8266 modified_left = f->left_pos; |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8267 modified_top = f->top_pos; |
|
52546
4e5fa718d892
* xterm.c (x_set_offset): Take window manager decorations
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
8268 |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8269 if (FRAME_X_DISPLAY_INFO (f)->wm_type == X_WMTYPE_A) |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8270 { |
|
52754
d08832a11cfd
* w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52753
diff
changeset
|
8271 /* Some WMs (twm, wmaker at least) has an offset that is smaller |
|
d08832a11cfd
* w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52753
diff
changeset
|
8272 than the WM decorations. So we use the calculated offset instead |
|
d08832a11cfd
* w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52753
diff
changeset
|
8273 of the WM decoration sizes here (x/y_pixels_outer_diff). */ |
|
d08832a11cfd
* w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52753
diff
changeset
|
8274 modified_left += FRAME_X_OUTPUT (f)->move_offset_left; |
|
d08832a11cfd
* w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52753
diff
changeset
|
8275 modified_top += FRAME_X_OUTPUT (f)->move_offset_top; |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8276 } |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8277 |
| 49322 | 8278 XMoveWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), |
| 8279 modified_left, modified_top); | |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8280 |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8281 if (FRAME_VISIBLE_P (f) |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8282 && FRAME_X_DISPLAY_INFO (f)->wm_type == X_WMTYPE_UNKNOWN) |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8283 { |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8284 FRAME_X_OUTPUT (f)->check_expected_move = 1; |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8285 FRAME_X_OUTPUT (f)->expected_top = f->top_pos; |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8286 FRAME_X_OUTPUT (f)->expected_left = f->left_pos; |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8287 } |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8288 |
| 286 | 8289 UNBLOCK_INPUT; |
| 8290 } | |
| 8291 | |
|
42717
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8292 /* Check if we need to resize the frame due to a fullscreen request. |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8293 If so needed, resize the frame. */ |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8294 static void |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8295 x_check_fullscreen (f) |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8296 struct frame *f; |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8297 { |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8298 if (f->want_fullscreen & FULLSCREEN_BOTH) |
|
42717
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8299 { |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8300 int width, height, ign; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8301 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8302 x_real_positions (f, &f->left_pos, &f->top_pos); |
|
42717
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8303 |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8304 x_fullscreen_adjust (f, &width, &height, &ign, &ign); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8305 |
|
42717
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8306 /* We do not need to move the window, it shall be taken care of |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8307 when setting WM manager hints. |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8308 If the frame is visible already, the position is checked by |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8309 x_check_expected_move. */ |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8310 if (FRAME_COLS (f) != width || FRAME_LINES (f) != height) |
|
42717
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8311 { |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8312 change_frame_size (f, height, width, 0, 1, 0); |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8313 SET_FRAME_GARBAGED (f); |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8314 cancel_mouse_face (f); |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8315 |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8316 /* Wait for the change of frame size to occur */ |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8317 f->want_fullscreen |= FULLSCREEN_WAIT; |
|
42717
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8318 } |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8319 } |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8320 } |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8321 |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8322 /* If frame parameters are set after the frame is mapped, we need to move |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8323 the window. |
|
42717
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8324 Some window managers moves the window to the right position, some |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8325 moves the outer window manager window to the specified position. |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8326 Here we check that we are in the right spot. If not, make a second |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8327 move, assuming we are dealing with the second kind of window manager. */ |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8328 static void |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8329 x_check_expected_move (f) |
|
42717
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8330 struct frame *f; |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8331 { |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8332 if (FRAME_X_OUTPUT (f)->check_expected_move) |
|
42717
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8333 { |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8334 int expect_top = FRAME_X_OUTPUT (f)->expected_top; |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8335 int expect_left = FRAME_X_OUTPUT (f)->expected_left; |
|
52754
d08832a11cfd
* w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52753
diff
changeset
|
8336 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8337 if (expect_top != f->top_pos || expect_left != f->left_pos) |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8338 { |
|
52754
d08832a11cfd
* w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52753
diff
changeset
|
8339 FRAME_X_DISPLAY_INFO (f)->wm_type = X_WMTYPE_A; |
|
d08832a11cfd
* w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52753
diff
changeset
|
8340 FRAME_X_OUTPUT (f)->move_offset_left = expect_left - f->left_pos; |
|
d08832a11cfd
* w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52753
diff
changeset
|
8341 FRAME_X_OUTPUT (f)->move_offset_top = expect_top - f->top_pos; |
|
d08832a11cfd
* w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52753
diff
changeset
|
8342 |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8343 x_set_offset (f, expect_left, expect_top, 1); |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8344 } |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8345 else if (FRAME_X_DISPLAY_INFO (f)->wm_type == X_WMTYPE_UNKNOWN) |
|
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8346 FRAME_X_DISPLAY_INFO (f)->wm_type = X_WMTYPE_B; |
|
42717
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8347 |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8348 /* Just do this once */ |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
8349 FRAME_X_OUTPUT (f)->check_expected_move = 0; |
|
42717
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8350 } |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8351 } |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8352 |
|
839386cf6e9b
(x_check_fullscreen, x_check_fullscreen_move)
Eli Zaretskii <eliz@gnu.org>
parents:
42688
diff
changeset
|
8353 |
|
35487
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8354 /* Change the size of frame F's X window to COLS/ROWS in the case F |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8355 doesn't have a widget. If CHANGE_GRAVITY is 1, we change to |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8356 top-left-corner window gravity for this size change and subsequent |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8357 size changes. Otherwise we leave the window gravity unchanged. */ |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8358 |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8359 static void |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8360 x_set_window_size_1 (f, change_gravity, cols, rows) |
| 771 | 8361 struct frame *f; |
|
5825
b1f35db748d8
(x_make_frame_invisible): Add USE_X_TOOLKIT conditional.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5753
diff
changeset
|
8362 int change_gravity; |
|
976
cbdfc337ec8f
* xterm.c (x_wm_hints): New variable.
Jim Blandy <jimb@redhat.com>
parents:
786
diff
changeset
|
8363 int cols, rows; |
| 286 | 8364 { |
| 8365 int pixelwidth, pixelheight; | |
|
5686
0c351de98a26
(x_set_window_size): Add USE_X_TOOLKIT conditional. Call EmacsFrameSetCharSize and return.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
5685
diff
changeset
|
8366 |
|
976
cbdfc337ec8f
* xterm.c (x_wm_hints): New variable.
Jim Blandy <jimb@redhat.com>
parents:
786
diff
changeset
|
8367 check_frame_size (f, &rows, &cols); |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8368 f->scroll_bar_actual_width |
|
9167
8ad448b29c1c
(x_new_font): New rule for computing column width. Factored out common code.
Karl Heuer <kwzh@gnu.org>
parents:
9101
diff
changeset
|
8369 = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f) |
|
8ad448b29c1c
(x_new_font): New rule for computing column width. Factored out common code.
Karl Heuer <kwzh@gnu.org>
parents:
9101
diff
changeset
|
8370 ? 0 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8371 : FRAME_CONFIG_SCROLL_BAR_WIDTH (f) > 0 |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8372 ? FRAME_CONFIG_SCROLL_BAR_WIDTH (f) |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8373 : (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f))); |
|
41721
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
8374 |
| 50097 | 8375 compute_fringe_widths (f, 0); |
|
41721
e0335ea68760
(zv_height, zv_bits, zv_period): Changed zv bitmap to
Kim F. Storm <storm@cua.dk>
parents:
41631
diff
changeset
|
8376 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8377 pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8378 pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8379 |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8380 f->win_gravity = NorthWestGravity; |
|
11915
e2ab839155e1
(XTflash): Use pointers as args to select.
Karl Heuer <kwzh@gnu.org>
parents:
11904
diff
changeset
|
8381 x_wm_set_size_hint (f, (long) 0, 0); |
|
8781
98741404d3e0
Delete X11 conditionals.
Richard M. Stallman <rms@gnu.org>
parents:
8724
diff
changeset
|
8382 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8383 XSync (FRAME_X_DISPLAY (f), False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8384 XResizeWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8385 pixelwidth, pixelheight); |
|
976
cbdfc337ec8f
* xterm.c (x_wm_hints): New variable.
Jim Blandy <jimb@redhat.com>
parents:
786
diff
changeset
|
8386 |
|
cbdfc337ec8f
* xterm.c (x_wm_hints): New variable.
Jim Blandy <jimb@redhat.com>
parents:
786
diff
changeset
|
8387 /* Now, strictly speaking, we can't be sure that this is accurate, |
|
cbdfc337ec8f
* xterm.c (x_wm_hints): New variable.
Jim Blandy <jimb@redhat.com>
parents:
786
diff
changeset
|
8388 but the window manager will get around to dealing with the size |
|
cbdfc337ec8f
* xterm.c (x_wm_hints): New variable.
Jim Blandy <jimb@redhat.com>
parents:
786
diff
changeset
|
8389 change request eventually, and we'll hear how it went when the |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
8390 ConfigureNotify event gets here. |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
8391 |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
8392 We could just not bother storing any of this information here, |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
8393 and let the ConfigureNotify event set everything up, but that |
|
25150
1c02364724aa
(x_set_window_size): When calling change_frame_size, specify 1 for DELAY.
Richard M. Stallman <rms@gnu.org>
parents:
25101
diff
changeset
|
8394 might be kind of confusing to the Lisp code, since size changes |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
8395 wouldn't be reported in the frame parameters until some random |
|
25150
1c02364724aa
(x_set_window_size): When calling change_frame_size, specify 1 for DELAY.
Richard M. Stallman <rms@gnu.org>
parents:
25101
diff
changeset
|
8396 point in the future when the ConfigureNotify event arrives. |
|
1c02364724aa
(x_set_window_size): When calling change_frame_size, specify 1 for DELAY.
Richard M. Stallman <rms@gnu.org>
parents:
25101
diff
changeset
|
8397 |
|
1c02364724aa
(x_set_window_size): When calling change_frame_size, specify 1 for DELAY.
Richard M. Stallman <rms@gnu.org>
parents:
25101
diff
changeset
|
8398 We pass 1 for DELAY since we can't run Lisp code inside of |
|
1c02364724aa
(x_set_window_size): When calling change_frame_size, specify 1 for DELAY.
Richard M. Stallman <rms@gnu.org>
parents:
25101
diff
changeset
|
8399 a BLOCK_INPUT. */ |
|
25360
2f3ad0a21be5
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25328
diff
changeset
|
8400 change_frame_size (f, rows, cols, 0, 1, 0); |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8401 FRAME_PIXEL_WIDTH (f) = pixelwidth; |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8402 FRAME_PIXEL_HEIGHT (f) = pixelheight; |
|
976
cbdfc337ec8f
* xterm.c (x_wm_hints): New variable.
Jim Blandy <jimb@redhat.com>
parents:
786
diff
changeset
|
8403 |
|
14692
e93656946a8c
(x_set_window_size): Clear out the mouse-highlighting data
Richard M. Stallman <rms@gnu.org>
parents:
14557
diff
changeset
|
8404 /* We've set {FRAME,PIXEL}_{WIDTH,HEIGHT} to the values we hope to |
|
e93656946a8c
(x_set_window_size): Clear out the mouse-highlighting data
Richard M. Stallman <rms@gnu.org>
parents:
14557
diff
changeset
|
8405 receive in the ConfigureNotify event; if we get what we asked |
|
e93656946a8c
(x_set_window_size): Clear out the mouse-highlighting data
Richard M. Stallman <rms@gnu.org>
parents:
14557
diff
changeset
|
8406 for, then the event won't cause the screen to become garbaged, so |
|
e93656946a8c
(x_set_window_size): Clear out the mouse-highlighting data
Richard M. Stallman <rms@gnu.org>
parents:
14557
diff
changeset
|
8407 we have to make sure to do it here. */ |
|
e93656946a8c
(x_set_window_size): Clear out the mouse-highlighting data
Richard M. Stallman <rms@gnu.org>
parents:
14557
diff
changeset
|
8408 SET_FRAME_GARBAGED (f); |
|
e93656946a8c
(x_set_window_size): Clear out the mouse-highlighting data
Richard M. Stallman <rms@gnu.org>
parents:
14557
diff
changeset
|
8409 |
|
e93656946a8c
(x_set_window_size): Clear out the mouse-highlighting data
Richard M. Stallman <rms@gnu.org>
parents:
14557
diff
changeset
|
8410 XFlush (FRAME_X_DISPLAY (f)); |
|
35487
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8411 } |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8412 |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8413 |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8414 /* Call this to change the size of frame F's x-window. |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8415 If CHANGE_GRAVITY is 1, we change to top-left-corner window gravity |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8416 for this size change and subsequent size changes. |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8417 Otherwise we leave the window gravity unchanged. */ |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8418 |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8419 void |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8420 x_set_window_size (f, change_gravity, cols, rows) |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8421 struct frame *f; |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8422 int change_gravity; |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8423 int cols, rows; |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8424 { |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8425 BLOCK_INPUT; |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8426 |
| 49322 | 8427 #ifdef USE_GTK |
| 8428 if (FRAME_GTK_WIDGET (f)) | |
| 8429 xg_frame_set_char_size (f, cols, rows); | |
| 8430 else | |
| 8431 x_set_window_size_1 (f, change_gravity, cols, rows); | |
| 8432 #elif USE_X_TOOLKIT | |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8433 |
|
36442
7fda58b1a204
(x_set_window_size): Don't use `None' with widgets; use
Gerd Moellmann <gerd@gnu.org>
parents:
36251
diff
changeset
|
8434 if (f->output_data.x->widget != NULL) |
|
35487
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8435 { |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8436 /* The x and y position of the widget is clobbered by the |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8437 call to XtSetValues within EmacsFrameSetCharSize. |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8438 This is a real kludge, but I don't understand Xt so I can't |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8439 figure out a correct fix. Can anyone else tell me? -- rms. */ |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8440 int xpos = f->output_data.x->widget->core.x; |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8441 int ypos = f->output_data.x->widget->core.y; |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8442 EmacsFrameSetCharSize (f->output_data.x->edit_widget, cols, rows); |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8443 f->output_data.x->widget->core.x = xpos; |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8444 f->output_data.x->widget->core.y = ypos; |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8445 } |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8446 else |
|
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8447 x_set_window_size_1 (f, change_gravity, cols, rows); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8448 |
|
35487
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8449 #else /* not USE_X_TOOLKIT */ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8450 |
|
35487
e92d3f50f8b8
(x_set_window_size_1): New function extracted from
Gerd Moellmann <gerd@gnu.org>
parents:
35393
diff
changeset
|
8451 x_set_window_size_1 (f, change_gravity, cols, rows); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8452 |
|
14692
e93656946a8c
(x_set_window_size): Clear out the mouse-highlighting data
Richard M. Stallman <rms@gnu.org>
parents:
14557
diff
changeset
|
8453 #endif /* not USE_X_TOOLKIT */ |
|
e93656946a8c
(x_set_window_size): Clear out the mouse-highlighting data
Richard M. Stallman <rms@gnu.org>
parents:
14557
diff
changeset
|
8454 |
|
7651
1569a13efdcd
(x_set_window_size): If cursor outside new size, mark it off.
Richard M. Stallman <rms@gnu.org>
parents:
7602
diff
changeset
|
8455 /* If cursor was outside the new size, mark it as off. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
8456 mark_window_cursors_off (XWINDOW (f->root_window)); |
|
7651
1569a13efdcd
(x_set_window_size): If cursor outside new size, mark it off.
Richard M. Stallman <rms@gnu.org>
parents:
7602
diff
changeset
|
8457 |
|
14692
e93656946a8c
(x_set_window_size): Clear out the mouse-highlighting data
Richard M. Stallman <rms@gnu.org>
parents:
14557
diff
changeset
|
8458 /* Clear out any recollection of where the mouse highlighting was, |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8459 since it might be in a place that's outside the new frame size. |
|
14692
e93656946a8c
(x_set_window_size): Clear out the mouse-highlighting data
Richard M. Stallman <rms@gnu.org>
parents:
14557
diff
changeset
|
8460 Actually checking whether it is outside is a pain in the neck, |
|
e93656946a8c
(x_set_window_size): Clear out the mouse-highlighting data
Richard M. Stallman <rms@gnu.org>
parents:
14557
diff
changeset
|
8461 so don't try--just let the highlighting be done afresh with new size. */ |
|
16491
7094452bc337
(cancel_mouse_face): New function. Code copied from
Richard M. Stallman <rms@gnu.org>
parents:
16483
diff
changeset
|
8462 cancel_mouse_face (f); |
|
14692
e93656946a8c
(x_set_window_size): Clear out the mouse-highlighting data
Richard M. Stallman <rms@gnu.org>
parents:
14557
diff
changeset
|
8463 |
| 286 | 8464 UNBLOCK_INPUT; |
| 8465 } | |
| 8466 | |
|
12172
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
8467 /* Mouse warping. */ |
| 286 | 8468 |
|
7026
55f9a506180d
(x_set_mouse_pixel_position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7001
diff
changeset
|
8469 void |
| 771 | 8470 x_set_mouse_position (f, x, y) |
| 8471 struct frame *f; | |
| 286 | 8472 int x, y; |
| 8473 { | |
| 8474 int pix_x, pix_y; | |
| 8475 | |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8476 pix_x = FRAME_COL_TO_PIXEL_X (f, x) + FRAME_COLUMN_WIDTH (f) / 2; |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8477 pix_y = FRAME_LINE_TO_PIXEL_Y (f, y) + FRAME_LINE_HEIGHT (f) / 2; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
8478 |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
8479 if (pix_x < 0) pix_x = 0; |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8480 if (pix_x > FRAME_PIXEL_WIDTH (f)) pix_x = FRAME_PIXEL_WIDTH (f); |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
8481 |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
8482 if (pix_y < 0) pix_y = 0; |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8483 if (pix_y > FRAME_PIXEL_HEIGHT (f)) pix_y = FRAME_PIXEL_HEIGHT (f); |
| 286 | 8484 |
| 8485 BLOCK_INPUT; | |
| 8486 | |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8487 XWarpPointer (FRAME_X_DISPLAY (f), None, FRAME_X_WINDOW (f), |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8488 0, 0, 0, 0, pix_x, pix_y); |
| 286 | 8489 UNBLOCK_INPUT; |
| 8490 } | |
| 8491 | |
|
7026
55f9a506180d
(x_set_mouse_pixel_position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7001
diff
changeset
|
8492 /* Move the mouse to position pixel PIX_X, PIX_Y relative to frame F. */ |
|
55f9a506180d
(x_set_mouse_pixel_position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7001
diff
changeset
|
8493 |
|
55f9a506180d
(x_set_mouse_pixel_position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7001
diff
changeset
|
8494 void |
|
55f9a506180d
(x_set_mouse_pixel_position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7001
diff
changeset
|
8495 x_set_mouse_pixel_position (f, pix_x, pix_y) |
|
55f9a506180d
(x_set_mouse_pixel_position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7001
diff
changeset
|
8496 struct frame *f; |
|
55f9a506180d
(x_set_mouse_pixel_position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7001
diff
changeset
|
8497 int pix_x, pix_y; |
|
55f9a506180d
(x_set_mouse_pixel_position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7001
diff
changeset
|
8498 { |
|
55f9a506180d
(x_set_mouse_pixel_position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7001
diff
changeset
|
8499 BLOCK_INPUT; |
|
55f9a506180d
(x_set_mouse_pixel_position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7001
diff
changeset
|
8500 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8501 XWarpPointer (FRAME_X_DISPLAY (f), None, FRAME_X_WINDOW (f), |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8502 0, 0, 0, 0, pix_x, pix_y); |
|
7026
55f9a506180d
(x_set_mouse_pixel_position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7001
diff
changeset
|
8503 UNBLOCK_INPUT; |
|
55f9a506180d
(x_set_mouse_pixel_position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7001
diff
changeset
|
8504 } |
|
12172
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
8505 |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
8506 /* focus shifting, raising and lowering. */ |
|
7026
55f9a506180d
(x_set_mouse_pixel_position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7001
diff
changeset
|
8507 |
| 21514 | 8508 void |
| 771 | 8509 x_focus_on_frame (f) |
| 8510 struct frame *f; | |
| 286 | 8511 { |
|
5156
fd78458b8c43
(XTread_socket): Really handle Xatom_wm_window_moved events.
Richard M. Stallman <rms@gnu.org>
parents:
5018
diff
changeset
|
8512 #if 0 /* This proves to be unpleasant. */ |
| 771 | 8513 x_raise_frame (f); |
|
5156
fd78458b8c43
(XTread_socket): Really handle Xatom_wm_window_moved events.
Richard M. Stallman <rms@gnu.org>
parents:
5018
diff
changeset
|
8514 #endif |
| 369 | 8515 #if 0 |
| 8516 /* I don't think that the ICCCM allows programs to do things like this | |
| 8517 without the interaction of the window manager. Whatever you end up | |
| 771 | 8518 doing with this code, do it to x_unfocus_frame too. */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8519 XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
| 286 | 8520 RevertToPointerRoot, CurrentTime); |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
8521 #endif /* ! 0 */ |
| 286 | 8522 } |
| 8523 | |
| 21514 | 8524 void |
| 771 | 8525 x_unfocus_frame (f) |
| 8526 struct frame *f; | |
| 286 | 8527 { |
| 369 | 8528 #if 0 |
| 771 | 8529 /* Look at the remarks in x_focus_on_frame. */ |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
8530 if (FRAME_X_DISPLAY_INFO (f)->x_focus_frame == f) |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8531 XSetInputFocus (FRAME_X_DISPLAY (f), PointerRoot, |
| 286 | 8532 RevertToPointerRoot, CurrentTime); |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
8533 #endif /* ! 0 */ |
| 286 | 8534 } |
| 8535 | |
| 771 | 8536 /* Raise frame F. */ |
| 8537 | |
| 21514 | 8538 void |
| 771 | 8539 x_raise_frame (f) |
| 8540 struct frame *f; | |
| 286 | 8541 { |
|
1658
452ba03935d7
* xterm.c (XTread_socket): When we get MapNotify, UnmapNotify,
Jim Blandy <jimb@redhat.com>
parents:
1530
diff
changeset
|
8542 if (f->async_visible) |
| 286 | 8543 { |
| 8544 BLOCK_INPUT; | |
|
49644
834df49192b0
Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
8545 XRaiseWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f)); |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8546 XFlush (FRAME_X_DISPLAY (f)); |
| 286 | 8547 UNBLOCK_INPUT; |
| 8548 } | |
| 8549 } | |
| 8550 | |
| 771 | 8551 /* Lower frame F. */ |
| 8552 | |
| 21514 | 8553 void |
| 771 | 8554 x_lower_frame (f) |
| 8555 struct frame *f; | |
| 286 | 8556 { |
|
1658
452ba03935d7
* xterm.c (XTread_socket): When we get MapNotify, UnmapNotify,
Jim Blandy <jimb@redhat.com>
parents:
1530
diff
changeset
|
8557 if (f->async_visible) |
| 286 | 8558 { |
| 8559 BLOCK_INPUT; | |
|
49644
834df49192b0
Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
8560 XLowerWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f)); |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8561 XFlush (FRAME_X_DISPLAY (f)); |
| 286 | 8562 UNBLOCK_INPUT; |
| 8563 } | |
| 8564 } | |
| 8565 | |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
8566 static void |
|
14411
bac274f178b0
(XTframe_raise_lower): Rename arg `raise' to `raise_flag'.
Richard M. Stallman <rms@gnu.org>
parents:
14305
diff
changeset
|
8567 XTframe_raise_lower (f, raise_flag) |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
8568 FRAME_PTR f; |
|
14411
bac274f178b0
(XTframe_raise_lower): Rename arg `raise' to `raise_flag'.
Richard M. Stallman <rms@gnu.org>
parents:
14305
diff
changeset
|
8569 int raise_flag; |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
8570 { |
|
14411
bac274f178b0
(XTframe_raise_lower): Rename arg `raise' to `raise_flag'.
Richard M. Stallman <rms@gnu.org>
parents:
14305
diff
changeset
|
8571 if (raise_flag) |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
8572 x_raise_frame (f); |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
8573 else |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
8574 x_lower_frame (f); |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
8575 } |
|
12172
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
8576 |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
8577 /* Change of visibility. */ |
| 286 | 8578 |
|
12192
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
8579 /* This tries to wait until the frame is really visible. |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
8580 However, if the window manager asks the user where to position |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
8581 the frame, this will return before the user finishes doing that. |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
8582 The frame will not actually be visible at that time, |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
8583 but it will become visible later when the window manager |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
8584 finishes with it. */ |
|
1b571a7992b0
(x_make_frame_visible): Test and set asked_for_visible.
Karl Heuer <kwzh@gnu.org>
parents:
12189
diff
changeset
|
8585 |
| 21514 | 8586 void |
| 771 | 8587 x_make_frame_visible (f) |
| 8588 struct frame *f; | |
| 286 | 8589 { |
|
9565
255d98c7cd67
(dumpglyphs): Explicitly draw background stipple.
Richard M. Stallman <rms@gnu.org>
parents:
9542
diff
changeset
|
8590 Lisp_Object type; |
|
17963
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8591 int original_top, original_left; |
|
31948
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8592 int retry_count = 2; |
|
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8593 |
|
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8594 retry: |
| 286 | 8595 |
| 429 | 8596 BLOCK_INPUT; |
| 8597 | |
|
9565
255d98c7cd67
(dumpglyphs): Explicitly draw background stipple.
Richard M. Stallman <rms@gnu.org>
parents:
9542
diff
changeset
|
8598 type = x_icon_type (f); |
|
255d98c7cd67
(dumpglyphs): Explicitly draw background stipple.
Richard M. Stallman <rms@gnu.org>
parents:
9542
diff
changeset
|
8599 if (!NILP (type)) |
|
255d98c7cd67
(dumpglyphs): Explicitly draw background stipple.
Richard M. Stallman <rms@gnu.org>
parents:
9542
diff
changeset
|
8600 x_bitmap_icon (f, type); |
|
9446
be58ba7c209d
(x_term_init): Call XtSetLanguageProc or XSetLocaleModifiers.
Richard M. Stallman <rms@gnu.org>
parents:
9340
diff
changeset
|
8601 |
| 771 | 8602 if (! FRAME_VISIBLE_P (f)) |
| 286 | 8603 { |
|
17963
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8604 /* We test FRAME_GARBAGED_P here to make sure we don't |
|
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8605 call x_set_offset a second time |
|
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8606 if we get to x_make_frame_visible a second time |
|
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8607 before the window gets really visible. */ |
|
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8608 if (! FRAME_ICONIFIED_P (f) |
|
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8609 && ! f->output_data.x->asked_for_visible) |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8610 x_set_offset (f, f->left_pos, f->top_pos, 0); |
|
17963
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8611 |
|
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8612 f->output_data.x->asked_for_visible = 1; |
|
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8613 |
| 429 | 8614 if (! EQ (Vx_no_window_manager, Qt)) |
| 771 | 8615 x_wm_set_window_state (f, NormalState); |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
8616 #ifdef USE_X_TOOLKIT |
|
7167
2fa74c48e4e5
(x_make_frame_visible): Use XtMapWidget, not XtPopup.
Richard M. Stallman <rms@gnu.org>
parents:
7128
diff
changeset
|
8617 /* This was XtPopup, but that did nothing for an iconified frame. */ |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
8618 XtMapWidget (f->output_data.x->widget); |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
8619 #else /* not USE_X_TOOLKIT */ |
| 49322 | 8620 #ifdef USE_GTK |
| 8621 gtk_widget_show_all (FRAME_GTK_OUTER_WIDGET (f)); | |
|
49651
05ebf4266798
xterm.c (x_make_frame_visible): Call gtk_window_deiconify.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49644
diff
changeset
|
8622 gtk_window_deiconify (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); |
| 49322 | 8623 #else |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
8624 XMapRaised (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); |
| 49322 | 8625 #endif /* not USE_GTK */ |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
8626 #endif /* not USE_X_TOOLKIT */ |
|
6883
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
8627 #if 0 /* This seems to bring back scroll bars in the wrong places |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
8628 if the window configuration has changed. They seem |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
8629 to come back ok without this. */ |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
8630 if (FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8631 XMapSubwindows (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); |
|
6883
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
8632 #endif |
| 429 | 8633 } |
| 286 | 8634 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8635 XFlush (FRAME_X_DISPLAY (f)); |
| 429 | 8636 |
|
7959
224440646fa7
(make_frame_visible): At end, wait till Emacs sees frame is visible.
Richard M. Stallman <rms@gnu.org>
parents:
7935
diff
changeset
|
8637 /* Synchronize to ensure Emacs knows the frame is visible |
|
224440646fa7
(make_frame_visible): At end, wait till Emacs sees frame is visible.
Richard M. Stallman <rms@gnu.org>
parents:
7935
diff
changeset
|
8638 before we do anything else. We do this loop with input not blocked |
|
224440646fa7
(make_frame_visible): At end, wait till Emacs sees frame is visible.
Richard M. Stallman <rms@gnu.org>
parents:
7935
diff
changeset
|
8639 so that incoming events are handled. */ |
|
224440646fa7
(make_frame_visible): At end, wait till Emacs sees frame is visible.
Richard M. Stallman <rms@gnu.org>
parents:
7935
diff
changeset
|
8640 { |
|
224440646fa7
(make_frame_visible): At end, wait till Emacs sees frame is visible.
Richard M. Stallman <rms@gnu.org>
parents:
7935
diff
changeset
|
8641 Lisp_Object frame; |
|
27040
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8642 int count; |
|
18528
73f4d9258f04
(x_make_frame_visible): Check has_been_visible
Richard M. Stallman <rms@gnu.org>
parents:
18347
diff
changeset
|
8643 /* This must be before UNBLOCK_INPUT |
|
73f4d9258f04
(x_make_frame_visible): Check has_been_visible
Richard M. Stallman <rms@gnu.org>
parents:
18347
diff
changeset
|
8644 since events that arrive in response to the actions above |
|
73f4d9258f04
(x_make_frame_visible): Check has_been_visible
Richard M. Stallman <rms@gnu.org>
parents:
18347
diff
changeset
|
8645 will set it when they are handled. */ |
|
73f4d9258f04
(x_make_frame_visible): Check has_been_visible
Richard M. Stallman <rms@gnu.org>
parents:
18347
diff
changeset
|
8646 int previously_visible = f->output_data.x->has_been_visible; |
|
17963
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8647 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8648 original_left = f->left_pos; |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8649 original_top = f->top_pos; |
|
9337
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
8650 |
|
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
8651 /* This must come after we set COUNT. */ |
|
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
8652 UNBLOCK_INPUT; |
|
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
8653 |
|
22907
43e290c6fb19
(x_list_fonts): Call XFreeFont after the new call to XLoadQueryFont.
Richard M. Stallman <rms@gnu.org>
parents:
22773
diff
changeset
|
8654 /* We unblock here so that arriving X events are processed. */ |
|
17963
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8655 |
|
18008
d25d2472df51
(XTread_socket) <ConfigureNotify>: Don't call
Richard M. Stallman <rms@gnu.org>
parents:
17963
diff
changeset
|
8656 /* Now move the window back to where it was "supposed to be". |
|
d25d2472df51
(XTread_socket) <ConfigureNotify>: Don't call
Richard M. Stallman <rms@gnu.org>
parents:
17963
diff
changeset
|
8657 But don't do it if the gravity is negative. |
|
d25d2472df51
(XTread_socket) <ConfigureNotify>: Don't call
Richard M. Stallman <rms@gnu.org>
parents:
17963
diff
changeset
|
8658 When the gravity is negative, this uses a position |
|
18528
73f4d9258f04
(x_make_frame_visible): Check has_been_visible
Richard M. Stallman <rms@gnu.org>
parents:
18347
diff
changeset
|
8659 that is 3 pixels too low. Perhaps that's really the border width. |
|
73f4d9258f04
(x_make_frame_visible): Check has_been_visible
Richard M. Stallman <rms@gnu.org>
parents:
18347
diff
changeset
|
8660 |
|
73f4d9258f04
(x_make_frame_visible): Check has_been_visible
Richard M. Stallman <rms@gnu.org>
parents:
18347
diff
changeset
|
8661 Don't do this if the window has never been visible before, |
|
73f4d9258f04
(x_make_frame_visible): Check has_been_visible
Richard M. Stallman <rms@gnu.org>
parents:
18347
diff
changeset
|
8662 because the window manager may choose the position |
|
73f4d9258f04
(x_make_frame_visible): Check has_been_visible
Richard M. Stallman <rms@gnu.org>
parents:
18347
diff
changeset
|
8663 and we don't want to override it. */ |
|
18008
d25d2472df51
(XTread_socket) <ConfigureNotify>: Don't call
Richard M. Stallman <rms@gnu.org>
parents:
17963
diff
changeset
|
8664 |
|
18630
3e414b9da546
(x_make_frame_visible): Don't move the frame
Richard M. Stallman <rms@gnu.org>
parents:
18528
diff
changeset
|
8665 if (! FRAME_VISIBLE_P (f) && ! FRAME_ICONIFIED_P (f) |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8666 && f->win_gravity == NorthWestGravity |
|
18528
73f4d9258f04
(x_make_frame_visible): Check has_been_visible
Richard M. Stallman <rms@gnu.org>
parents:
18347
diff
changeset
|
8667 && previously_visible) |
|
17963
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8668 { |
|
22907
43e290c6fb19
(x_list_fonts): Call XFreeFont after the new call to XLoadQueryFont.
Richard M. Stallman <rms@gnu.org>
parents:
22773
diff
changeset
|
8669 Drawable rootw; |
|
43e290c6fb19
(x_list_fonts): Call XFreeFont after the new call to XLoadQueryFont.
Richard M. Stallman <rms@gnu.org>
parents:
22773
diff
changeset
|
8670 int x, y; |
|
43e290c6fb19
(x_list_fonts): Call XFreeFont after the new call to XLoadQueryFont.
Richard M. Stallman <rms@gnu.org>
parents:
22773
diff
changeset
|
8671 unsigned int width, height, border, depth; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8672 |
|
17963
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8673 BLOCK_INPUT; |
|
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8674 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
8675 /* On some window managers (such as FVWM) moving an existing |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
8676 window, even to the same place, causes the window manager |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
8677 to introduce an offset. This can cause the window to move |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
8678 to an unexpected location. Check the geometry (a little |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
8679 slow here) and then verify that the window is in the right |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
8680 place. If the window is not in the right place, move it |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
8681 there, and take the potential window manager hit. */ |
|
22907
43e290c6fb19
(x_list_fonts): Call XFreeFont after the new call to XLoadQueryFont.
Richard M. Stallman <rms@gnu.org>
parents:
22773
diff
changeset
|
8682 XGetGeometry (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), |
|
43e290c6fb19
(x_list_fonts): Call XFreeFont after the new call to XLoadQueryFont.
Richard M. Stallman <rms@gnu.org>
parents:
22773
diff
changeset
|
8683 &rootw, &x, &y, &width, &height, &border, &depth); |
|
43e290c6fb19
(x_list_fonts): Call XFreeFont after the new call to XLoadQueryFont.
Richard M. Stallman <rms@gnu.org>
parents:
22773
diff
changeset
|
8684 |
|
43e290c6fb19
(x_list_fonts): Call XFreeFont after the new call to XLoadQueryFont.
Richard M. Stallman <rms@gnu.org>
parents:
22773
diff
changeset
|
8685 if (original_left != x || original_top != y) |
|
43e290c6fb19
(x_list_fonts): Call XFreeFont after the new call to XLoadQueryFont.
Richard M. Stallman <rms@gnu.org>
parents:
22773
diff
changeset
|
8686 XMoveWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), |
|
43e290c6fb19
(x_list_fonts): Call XFreeFont after the new call to XLoadQueryFont.
Richard M. Stallman <rms@gnu.org>
parents:
22773
diff
changeset
|
8687 original_left, original_top); |
|
43e290c6fb19
(x_list_fonts): Call XFreeFont after the new call to XLoadQueryFont.
Richard M. Stallman <rms@gnu.org>
parents:
22773
diff
changeset
|
8688 |
|
17963
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8689 UNBLOCK_INPUT; |
|
b77c13e71ba3
(XTread_socket) <UnmapNotify>: Don't make an inconify_event
Richard M. Stallman <rms@gnu.org>
parents:
17953
diff
changeset
|
8690 } |
|
17953
96a51be54a7e
(x_make_frame_visible): Call x_set_offset only after
Richard M. Stallman <rms@gnu.org>
parents:
17877
diff
changeset
|
8691 |
|
9338
873508897cc2
(x_new_focus_frame, construct_mouse_click, construct_menu_click,
Karl Heuer <kwzh@gnu.org>
parents:
9337
diff
changeset
|
8692 XSETFRAME (frame, f); |
|
9337
7b933936a676
(input_signal_count): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9232
diff
changeset
|
8693 |
|
27040
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8694 /* Wait until the frame is visible. Process X events until a |
|
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8695 MapNotify event has been seen, or until we think we won't get a |
|
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8696 MapNotify at all.. */ |
|
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8697 for (count = input_signal_count + 10; |
|
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8698 input_signal_count < count && !FRAME_VISIBLE_P (f);) |
|
8098
e44c31d682b1
(x_draw_box): Use curs_x and curs_y, not f->cursor_[xy].
Richard M. Stallman <rms@gnu.org>
parents:
8036
diff
changeset
|
8699 { |
|
27040
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8700 /* Force processing of queued events. */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8701 x_sync (f); |
|
27040
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8702 |
|
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8703 /* Machines that do polling rather than SIGIO have been |
|
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8704 observed to go into a busy-wait here. So we'll fake an |
|
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8705 alarm signal to let the handler know that there's something |
|
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8706 to be read. We used to raise a real alarm, but it seems |
|
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8707 that the handler isn't always enabled here. This is |
|
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8708 probably a bug. */ |
|
8682
42f95b1368ea
(x_make_frame_visible): Call input_polling_used.
Richard M. Stallman <rms@gnu.org>
parents:
8652
diff
changeset
|
8709 if (input_polling_used ()) |
| 8652 | 8710 { |
|
27040
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8711 /* It could be confusing if a real alarm arrives while |
|
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8712 processing the fake one. Turn it off and let the |
|
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8713 handler reset it. */ |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
8714 extern void poll_for_input_1 P_ ((void)); |
|
27428
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
8715 int old_poll_suppress_count = poll_suppress_count; |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
8716 poll_suppress_count = 1; |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
8717 poll_for_input_1 (); |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
8718 poll_suppress_count = old_poll_suppress_count; |
| 8652 | 8719 } |
|
27040
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8720 |
|
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8721 /* See if a MapNotify event has been processed. */ |
|
900a02429efa
(x_make_frame_visible): Wait for frame becoming visible
Gerd Moellmann <gerd@gnu.org>
parents:
27000
diff
changeset
|
8722 FRAME_SAMPLE_VISIBILITY (f); |
|
8098
e44c31d682b1
(x_draw_box): Use curs_x and curs_y, not f->cursor_[xy].
Richard M. Stallman <rms@gnu.org>
parents:
8036
diff
changeset
|
8723 } |
|
31948
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8724 |
|
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8725 /* 2000-09-28: In |
|
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8726 |
|
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8727 (let ((f (selected-frame))) |
|
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8728 (iconify-frame f) |
|
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8729 (raise-frame f)) |
|
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8730 |
|
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8731 the frame is not raised with various window managers on |
| 51093 | 8732 FreeBSD, GNU/Linux and Solaris. It turns out that, for some |
|
31948
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8733 unknown reason, the call to XtMapWidget is completely ignored. |
|
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8734 Mapping the widget a second time works. */ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
8735 |
|
31948
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8736 if (!FRAME_VISIBLE_P (f) && --retry_count > 0) |
|
a6e9ef37895d
(x_make_frame_visible): Try harder to make the frame
Gerd Moellmann <gerd@gnu.org>
parents:
31864
diff
changeset
|
8737 goto retry; |
|
7959
224440646fa7
(make_frame_visible): At end, wait till Emacs sees frame is visible.
Richard M. Stallman <rms@gnu.org>
parents:
7935
diff
changeset
|
8738 } |
| 286 | 8739 } |
| 8740 | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
8741 /* Change from mapped state to withdrawn state. */ |
| 286 | 8742 |
|
12172
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
8743 /* Make the frame visible (mapped and not iconified). */ |
|
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
8744 |
| 21514 | 8745 void |
| 771 | 8746 x_make_frame_invisible (f) |
| 8747 struct frame *f; | |
| 286 | 8748 { |
|
7602
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8749 Window window; |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8750 |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8751 /* Use the frame's outermost window, not the one we normally draw on. */ |
|
49644
834df49192b0
Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
8752 window = FRAME_OUTER_WINDOW (f); |
| 286 | 8753 |
|
3284
a47979ffad1e
(XTread_socket): For UnmapNotify, if frame was visible,
Richard M. Stallman <rms@gnu.org>
parents:
3282
diff
changeset
|
8754 /* Don't keep the highlight on an invisible frame. */ |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
8755 if (FRAME_X_DISPLAY_INFO (f)->x_highlight_frame == f) |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
8756 FRAME_X_DISPLAY_INFO (f)->x_highlight_frame = 0; |
|
3284
a47979ffad1e
(XTread_socket): For UnmapNotify, if frame was visible,
Richard M. Stallman <rms@gnu.org>
parents:
3282
diff
changeset
|
8757 |
|
6983
b18e5c09d7c3
(XTread_socket, case ClientMessage): Use x_window_to_frame unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
6941
diff
changeset
|
8758 #if 0/* This might add unreliability; I don't trust it -- rms. */ |
|
3284
a47979ffad1e
(XTread_socket): For UnmapNotify, if frame was visible,
Richard M. Stallman <rms@gnu.org>
parents:
3282
diff
changeset
|
8759 if (! f->async_visible && ! f->async_iconified) |
| 286 | 8760 return; |
|
6983
b18e5c09d7c3
(XTread_socket, case ClientMessage): Use x_window_to_frame unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
6941
diff
changeset
|
8761 #endif |
| 286 | 8762 |
| 8763 BLOCK_INPUT; | |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
8764 |
|
7210
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
8765 /* Before unmapping the window, update the WM_SIZE_HINTS property to claim |
|
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
8766 that the current position of the window is user-specified, rather than |
|
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
8767 program-specified, so that when the window is mapped again, it will be |
|
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
8768 placed at the same location, without forcing the user to position it |
|
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
8769 by hand again (they have already done that once for this window.) */ |
|
11915
e2ab839155e1
(XTflash): Use pointers as args to select.
Karl Heuer <kwzh@gnu.org>
parents:
11904
diff
changeset
|
8770 x_wm_set_size_hint (f, (long) 0, 1); |
|
7210
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
8771 |
| 49322 | 8772 #ifdef USE_GTK |
| 8773 if (FRAME_GTK_OUTER_WIDGET (f)) | |
|
50324
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
8774 gtk_widget_hide (FRAME_GTK_OUTER_WIDGET (f)); |
|
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
8775 else |
|
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
8776 #endif |
|
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
8777 { |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
8778 #ifdef HAVE_X11R4 |
|
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
8779 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8780 if (! XWithdrawWindow (FRAME_X_DISPLAY (f), window, |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8781 DefaultScreen (FRAME_X_DISPLAY (f)))) |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
8782 { |
|
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
8783 UNBLOCK_INPUT_RESIGNAL; |
|
7602
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8784 error ("Can't notify window manager of window withdrawal"); |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
8785 } |
|
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
8786 #else /* ! defined (HAVE_X11R4) */ |
|
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
8787 |
|
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
8788 /* Tell the window manager what we're going to do. */ |
| 286 | 8789 if (! EQ (Vx_no_window_manager, Qt)) |
| 8790 { | |
|
1020
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8791 XEvent unmap; |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8792 |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8793 unmap.xunmap.type = UnmapNotify; |
|
7602
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8794 unmap.xunmap.window = window; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8795 unmap.xunmap.event = DefaultRootWindow (FRAME_X_DISPLAY (f)); |
|
1020
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8796 unmap.xunmap.from_configure = False; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8797 if (! XSendEvent (FRAME_X_DISPLAY (f), |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8798 DefaultRootWindow (FRAME_X_DISPLAY (f)), |
|
1020
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8799 False, |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
8800 SubstructureRedirectMaskSubstructureNotifyMask, |
|
1020
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8801 &unmap)) |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8802 { |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8803 UNBLOCK_INPUT_RESIGNAL; |
|
7602
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8804 error ("Can't notify window manager of withdrawal"); |
|
1020
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8805 } |
| 286 | 8806 } |
| 8807 | |
|
1020
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8808 /* Unmap the window ourselves. Cheeky! */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8809 XUnmapWindow (FRAME_X_DISPLAY (f), window); |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
8810 #endif /* ! defined (HAVE_X11R4) */ |
|
50324
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
8811 } |
|
d9a401f2769d
(take_vertical_position_into_account): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50270
diff
changeset
|
8812 |
|
6983
b18e5c09d7c3
(XTread_socket, case ClientMessage): Use x_window_to_frame unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
6941
diff
changeset
|
8813 /* We can't distinguish this from iconification |
|
b18e5c09d7c3
(XTread_socket, case ClientMessage): Use x_window_to_frame unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
6941
diff
changeset
|
8814 just by the event that we get from the server. |
|
b18e5c09d7c3
(XTread_socket, case ClientMessage): Use x_window_to_frame unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
6941
diff
changeset
|
8815 So we can't win using the usual strategy of letting |
|
b18e5c09d7c3
(XTread_socket, case ClientMessage): Use x_window_to_frame unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
6941
diff
changeset
|
8816 FRAME_SAMPLE_VISIBILITY set this. So do it by hand, |
|
b18e5c09d7c3
(XTread_socket, case ClientMessage): Use x_window_to_frame unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
6941
diff
changeset
|
8817 and synchronize with the server to make sure we agree. */ |
|
b18e5c09d7c3
(XTread_socket, case ClientMessage): Use x_window_to_frame unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
6941
diff
changeset
|
8818 f->visible = 0; |
|
b18e5c09d7c3
(XTread_socket, case ClientMessage): Use x_window_to_frame unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
6941
diff
changeset
|
8819 FRAME_ICONIFIED_P (f) = 0; |
|
b18e5c09d7c3
(XTread_socket, case ClientMessage): Use x_window_to_frame unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
6941
diff
changeset
|
8820 f->async_visible = 0; |
|
b18e5c09d7c3
(XTread_socket, case ClientMessage): Use x_window_to_frame unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
6941
diff
changeset
|
8821 f->async_iconified = 0; |
|
b18e5c09d7c3
(XTread_socket, case ClientMessage): Use x_window_to_frame unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
6941
diff
changeset
|
8822 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8823 x_sync (f); |
|
6983
b18e5c09d7c3
(XTread_socket, case ClientMessage): Use x_window_to_frame unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
6941
diff
changeset
|
8824 |
| 286 | 8825 UNBLOCK_INPUT; |
| 8826 } | |
| 8827 | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
8828 /* Change window state from mapped to iconified. */ |
| 286 | 8829 |
| 21514 | 8830 void |
| 771 | 8831 x_iconify_frame (f) |
| 8832 struct frame *f; | |
| 286 | 8833 { |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
8834 int result; |
|
9565
255d98c7cd67
(dumpglyphs): Explicitly draw background stipple.
Richard M. Stallman <rms@gnu.org>
parents:
9542
diff
changeset
|
8835 Lisp_Object type; |
| 286 | 8836 |
|
3284
a47979ffad1e
(XTread_socket): For UnmapNotify, if frame was visible,
Richard M. Stallman <rms@gnu.org>
parents:
3282
diff
changeset
|
8837 /* Don't keep the highlight on an invisible frame. */ |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
8838 if (FRAME_X_DISPLAY_INFO (f)->x_highlight_frame == f) |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
8839 FRAME_X_DISPLAY_INFO (f)->x_highlight_frame = 0; |
|
3284
a47979ffad1e
(XTread_socket): For UnmapNotify, if frame was visible,
Richard M. Stallman <rms@gnu.org>
parents:
3282
diff
changeset
|
8840 |
|
1658
452ba03935d7
* xterm.c (XTread_socket): When we get MapNotify, UnmapNotify,
Jim Blandy <jimb@redhat.com>
parents:
1530
diff
changeset
|
8841 if (f->async_iconified) |
| 286 | 8842 return; |
| 8843 | |
|
9446
be58ba7c209d
(x_term_init): Call XtSetLanguageProc or XSetLocaleModifiers.
Richard M. Stallman <rms@gnu.org>
parents:
9340
diff
changeset
|
8844 BLOCK_INPUT; |
|
be58ba7c209d
(x_term_init): Call XtSetLanguageProc or XSetLocaleModifiers.
Richard M. Stallman <rms@gnu.org>
parents:
9340
diff
changeset
|
8845 |
|
13627
8873aa3451dd
(XTmouse_position): Exit the loop if child == win.
Richard M. Stallman <rms@gnu.org>
parents:
13598
diff
changeset
|
8846 FRAME_SAMPLE_VISIBILITY (f); |
|
8873aa3451dd
(XTmouse_position): Exit the loop if child == win.
Richard M. Stallman <rms@gnu.org>
parents:
13598
diff
changeset
|
8847 |
|
9565
255d98c7cd67
(dumpglyphs): Explicitly draw background stipple.
Richard M. Stallman <rms@gnu.org>
parents:
9542
diff
changeset
|
8848 type = x_icon_type (f); |
|
255d98c7cd67
(dumpglyphs): Explicitly draw background stipple.
Richard M. Stallman <rms@gnu.org>
parents:
9542
diff
changeset
|
8849 if (!NILP (type)) |
|
255d98c7cd67
(dumpglyphs): Explicitly draw background stipple.
Richard M. Stallman <rms@gnu.org>
parents:
9542
diff
changeset
|
8850 x_bitmap_icon (f, type); |
|
9446
be58ba7c209d
(x_term_init): Call XtSetLanguageProc or XSetLocaleModifiers.
Richard M. Stallman <rms@gnu.org>
parents:
9340
diff
changeset
|
8851 |
| 49322 | 8852 #ifdef USE_GTK |
| 8853 if (FRAME_GTK_OUTER_WIDGET (f)) | |
| 8854 { | |
| 8855 if (! FRAME_VISIBLE_P (f)) | |
| 8856 gtk_widget_show_all (FRAME_GTK_OUTER_WIDGET (f)); | |
| 8857 | |
| 8858 gtk_window_iconify (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); | |
| 8859 f->iconified = 1; | |
| 8860 f->visible = 1; | |
| 8861 f->async_iconified = 1; | |
| 8862 f->async_visible = 0; | |
| 8863 UNBLOCK_INPUT; | |
| 8864 return; | |
| 8865 } | |
| 8866 #endif | |
| 8867 | |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
8868 #ifdef USE_X_TOOLKIT |
|
7602
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8869 |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8870 if (! FRAME_VISIBLE_P (f)) |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8871 { |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8872 if (! EQ (Vx_no_window_manager, Qt)) |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8873 x_wm_set_window_state (f, IconicState); |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8874 /* This was XtPopup, but that did nothing for an iconified frame. */ |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
8875 XtMapWidget (f->output_data.x->widget); |
|
15472
300b52e37681
(x_iconify_frame): If frame is invisible, explicitly mark it as iconified.
Richard M. Stallman <rms@gnu.org>
parents:
15376
diff
changeset
|
8876 /* The server won't give us any event to indicate |
|
300b52e37681
(x_iconify_frame): If frame is invisible, explicitly mark it as iconified.
Richard M. Stallman <rms@gnu.org>
parents:
15376
diff
changeset
|
8877 that an invisible frame was changed to an icon, |
|
300b52e37681
(x_iconify_frame): If frame is invisible, explicitly mark it as iconified.
Richard M. Stallman <rms@gnu.org>
parents:
15376
diff
changeset
|
8878 so we have to record it here. */ |
|
300b52e37681
(x_iconify_frame): If frame is invisible, explicitly mark it as iconified.
Richard M. Stallman <rms@gnu.org>
parents:
15376
diff
changeset
|
8879 f->iconified = 1; |
|
16753
ab63a77c3a23
(x_iconify_frame): Clear visible when we set iconified.
Richard M. Stallman <rms@gnu.org>
parents:
16491
diff
changeset
|
8880 f->visible = 1; |
|
15472
300b52e37681
(x_iconify_frame): If frame is invisible, explicitly mark it as iconified.
Richard M. Stallman <rms@gnu.org>
parents:
15376
diff
changeset
|
8881 f->async_iconified = 1; |
|
16753
ab63a77c3a23
(x_iconify_frame): Clear visible when we set iconified.
Richard M. Stallman <rms@gnu.org>
parents:
16491
diff
changeset
|
8882 f->async_visible = 0; |
|
7602
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8883 UNBLOCK_INPUT; |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8884 return; |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8885 } |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8886 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8887 result = XIconifyWindow (FRAME_X_DISPLAY (f), |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
8888 XtWindow (f->output_data.x->widget), |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8889 DefaultScreen (FRAME_X_DISPLAY (f))); |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
8890 UNBLOCK_INPUT; |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
8891 |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
8892 if (!result) |
|
7602
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8893 error ("Can't notify window manager of iconification"); |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
8894 |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
8895 f->async_iconified = 1; |
|
16753
ab63a77c3a23
(x_iconify_frame): Clear visible when we set iconified.
Richard M. Stallman <rms@gnu.org>
parents:
16491
diff
changeset
|
8896 f->async_visible = 0; |
|
ab63a77c3a23
(x_iconify_frame): Clear visible when we set iconified.
Richard M. Stallman <rms@gnu.org>
parents:
16491
diff
changeset
|
8897 |
|
5740
48da4ed089e9
(x_iconify_frame): Fix misbalanced BLOCK_INPUT/UNBLOCK_INPUT.
Karl Heuer <kwzh@gnu.org>
parents:
5737
diff
changeset
|
8898 |
|
48da4ed089e9
(x_iconify_frame): Fix misbalanced BLOCK_INPUT/UNBLOCK_INPUT.
Karl Heuer <kwzh@gnu.org>
parents:
5737
diff
changeset
|
8899 BLOCK_INPUT; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8900 XFlush (FRAME_X_DISPLAY (f)); |
|
5740
48da4ed089e9
(x_iconify_frame): Fix misbalanced BLOCK_INPUT/UNBLOCK_INPUT.
Karl Heuer <kwzh@gnu.org>
parents:
5737
diff
changeset
|
8901 UNBLOCK_INPUT; |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
8902 #else /* not USE_X_TOOLKIT */ |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
8903 |
|
7738
a810335742bb
(x_iconify_frame): Call x_set_offset,
Richard M. Stallman <rms@gnu.org>
parents:
7706
diff
changeset
|
8904 /* Make sure the X server knows where the window should be positioned, |
|
a810335742bb
(x_iconify_frame): Call x_set_offset,
Richard M. Stallman <rms@gnu.org>
parents:
7706
diff
changeset
|
8905 in case the user deiconifies with the window manager. */ |
|
a810335742bb
(x_iconify_frame): Call x_set_offset,
Richard M. Stallman <rms@gnu.org>
parents:
7706
diff
changeset
|
8906 if (! FRAME_VISIBLE_P (f) && !FRAME_ICONIFIED_P (f)) |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
8907 x_set_offset (f, f->left_pos, f->top_pos, 0); |
|
7738
a810335742bb
(x_iconify_frame): Call x_set_offset,
Richard M. Stallman <rms@gnu.org>
parents:
7706
diff
changeset
|
8908 |
|
1020
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8909 /* Since we don't know which revision of X we're running, we'll use both |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8910 the X11R3 and X11R4 techniques. I don't know if this is a good idea. */ |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8911 |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8912 /* X11R4: send a ClientMessage to the window manager using the |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8913 WM_CHANGE_STATE type. */ |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8914 { |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8915 XEvent message; |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
8916 |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
8917 message.xclient.window = FRAME_X_WINDOW (f); |
|
1020
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8918 message.xclient.type = ClientMessage; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8919 message.xclient.message_type = FRAME_X_DISPLAY_INFO (f)->Xatom_wm_change_state; |
|
1020
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8920 message.xclient.format = 32; |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8921 message.xclient.data.l[0] = IconicState; |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8922 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8923 if (! XSendEvent (FRAME_X_DISPLAY (f), |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8924 DefaultRootWindow (FRAME_X_DISPLAY (f)), |
|
1020
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8925 False, |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8926 SubstructureRedirectMask | SubstructureNotifyMask, |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8927 &message)) |
| 286 | 8928 { |
| 8929 UNBLOCK_INPUT_RESIGNAL; | |
|
7602
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
8930 error ("Can't notify window manager of iconification"); |
| 286 | 8931 } |
|
1020
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8932 } |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8933 |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
8934 /* X11R3: set the initial_state field of the window manager hints to |
|
1020
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8935 IconicState. */ |
|
7c2565dd644c
* xterm.c (x_wm_hints): Variable deleted. This has to be
Jim Blandy <jimb@redhat.com>
parents:
976
diff
changeset
|
8936 x_wm_set_window_state (f, IconicState); |
| 286 | 8937 |
|
4304
b5014da888a8
(x_iconify_frame): Handle case where frame was invisible.
Richard M. Stallman <rms@gnu.org>
parents:
4277
diff
changeset
|
8938 if (!FRAME_VISIBLE_P (f)) |
|
b5014da888a8
(x_iconify_frame): Handle case where frame was invisible.
Richard M. Stallman <rms@gnu.org>
parents:
4277
diff
changeset
|
8939 { |
|
b5014da888a8
(x_iconify_frame): Handle case where frame was invisible.
Richard M. Stallman <rms@gnu.org>
parents:
4277
diff
changeset
|
8940 /* If the frame was withdrawn, before, we must map it. */ |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
8941 XMapRaised (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); |
|
4304
b5014da888a8
(x_iconify_frame): Handle case where frame was invisible.
Richard M. Stallman <rms@gnu.org>
parents:
4277
diff
changeset
|
8942 } |
|
b5014da888a8
(x_iconify_frame): Handle case where frame was invisible.
Richard M. Stallman <rms@gnu.org>
parents:
4277
diff
changeset
|
8943 |
|
1658
452ba03935d7
* xterm.c (XTread_socket): When we get MapNotify, UnmapNotify,
Jim Blandy <jimb@redhat.com>
parents:
1530
diff
changeset
|
8944 f->async_iconified = 1; |
|
16753
ab63a77c3a23
(x_iconify_frame): Clear visible when we set iconified.
Richard M. Stallman <rms@gnu.org>
parents:
16491
diff
changeset
|
8945 f->async_visible = 0; |
| 286 | 8946 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
8947 XFlush (FRAME_X_DISPLAY (f)); |
| 286 | 8948 UNBLOCK_INPUT; |
|
5740
48da4ed089e9
(x_iconify_frame): Fix misbalanced BLOCK_INPUT/UNBLOCK_INPUT.
Karl Heuer <kwzh@gnu.org>
parents:
5737
diff
changeset
|
8949 #endif /* not USE_X_TOOLKIT */ |
| 286 | 8950 } |
|
34526
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
8951 |
|
12172
58ce63f11008
(x_get_keysym_name): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12079
diff
changeset
|
8952 |
|
34526
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
8953 /* Free X resources of frame F. */ |
|
1810
bf618128d973
* xterm.c (x_scrollbar_create): Set the scrollbars to use
Jim Blandy <jimb@redhat.com>
parents:
1803
diff
changeset
|
8954 |
| 21514 | 8955 void |
|
34526
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
8956 x_free_frame_resources (f) |
| 771 | 8957 struct frame *f; |
| 286 | 8958 { |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
8959 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
41837
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8960 Lisp_Object bar; |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8961 struct scroll_bar *b; |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
8962 |
| 286 | 8963 BLOCK_INPUT; |
|
1810
bf618128d973
* xterm.c (x_scrollbar_create): Set the scrollbars to use
Jim Blandy <jimb@redhat.com>
parents:
1803
diff
changeset
|
8964 |
|
14489
9bc700f13f97
(x_connection_signal): Call x_connection_closed properly.
Richard M. Stallman <rms@gnu.org>
parents:
14411
diff
changeset
|
8965 /* If a display connection is dead, don't try sending more |
|
9bc700f13f97
(x_connection_signal): Call x_connection_closed properly.
Richard M. Stallman <rms@gnu.org>
parents:
14411
diff
changeset
|
8966 commands to the X server. */ |
|
34526
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
8967 if (dpyinfo->display) |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
8968 { |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
8969 if (f->output_data.x->icon_desc) |
|
14489
9bc700f13f97
(x_connection_signal): Call x_connection_closed properly.
Richard M. Stallman <rms@gnu.org>
parents:
14411
diff
changeset
|
8970 XDestroyWindow (FRAME_X_DISPLAY (f), f->output_data.x->icon_desc); |
|
41837
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8971 |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8972 #ifdef USE_X_TOOLKIT |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8973 /* Explicitly destroy the scroll bars of the frame. Without |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8974 this, we get "BadDrawable" errors from the toolkit later on, |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8975 presumably from expose events generated for the disappearing |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8976 toolkit scroll bars. */ |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8977 for (bar = FRAME_SCROLL_BARS (f); !NILP (bar); bar = b->next) |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8978 { |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8979 b = XSCROLL_BAR (bar); |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8980 x_scroll_bar_remove (b); |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8981 } |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8982 #endif |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8983 |
|
14830
34db919835d3
(x_destroy_window) [HAVE_X_I18N]: Free xic and xim of frame.
Richard M. Stallman <rms@gnu.org>
parents:
14826
diff
changeset
|
8984 #ifdef HAVE_X_I18N |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8985 if (FRAME_XIC (f)) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
8986 free_frame_xic (f); |
|
14830
34db919835d3
(x_destroy_window) [HAVE_X_I18N]: Free xic and xim of frame.
Richard M. Stallman <rms@gnu.org>
parents:
14826
diff
changeset
|
8987 #endif |
|
41837
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8988 |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
8989 #ifdef USE_X_TOOLKIT |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
8990 if (f->output_data.x->widget) |
|
37212
5c27e50f91d1
(x_free_frame_resources) [USE_X_TOOLKIT]: Set
Gerd Moellmann <gerd@gnu.org>
parents:
37153
diff
changeset
|
8991 { |
|
5c27e50f91d1
(x_free_frame_resources) [USE_X_TOOLKIT]: Set
Gerd Moellmann <gerd@gnu.org>
parents:
37153
diff
changeset
|
8992 XtDestroyWidget (f->output_data.x->widget); |
|
5c27e50f91d1
(x_free_frame_resources) [USE_X_TOOLKIT]: Set
Gerd Moellmann <gerd@gnu.org>
parents:
37153
diff
changeset
|
8993 f->output_data.x->widget = NULL; |
|
5c27e50f91d1
(x_free_frame_resources) [USE_X_TOOLKIT]: Set
Gerd Moellmann <gerd@gnu.org>
parents:
37153
diff
changeset
|
8994 } |
|
41837
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8995 /* Tooltips don't have widgets, only a simple X window, even if |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8996 we are using a toolkit. */ |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8997 else if (FRAME_X_WINDOW (f)) |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8998 XDestroyWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
8999 |
|
14489
9bc700f13f97
(x_connection_signal): Call x_connection_closed properly.
Richard M. Stallman <rms@gnu.org>
parents:
14411
diff
changeset
|
9000 free_frame_menubar (f); |
|
41837
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
9001 #else /* !USE_X_TOOLKIT */ |
| 49322 | 9002 |
| 9003 #ifdef USE_GTK | |
| 9004 /* In the GTK version, tooltips are normal X | |
| 9005 frames. We must check and free both types. */ | |
| 9006 if (FRAME_GTK_OUTER_WIDGET (f)) | |
| 9007 { | |
| 9008 gtk_widget_destroy (FRAME_GTK_OUTER_WIDGET (f)); | |
| 9009 FRAME_X_WINDOW (f) = 0; /* Set to avoid XDestroyWindow below */ | |
| 9010 FRAME_GTK_OUTER_WIDGET (f) = 0; | |
| 9011 } | |
| 9012 #endif /* USE_GTK */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
9013 |
|
41837
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
9014 if (FRAME_X_WINDOW (f)) |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
9015 XDestroyWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); |
|
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
9016 #endif /* !USE_X_TOOLKIT */ |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
9017 |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9018 unload_color (f, f->output_data.x->foreground_pixel); |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9019 unload_color (f, f->output_data.x->background_pixel); |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9020 unload_color (f, f->output_data.x->cursor_pixel); |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9021 unload_color (f, f->output_data.x->cursor_foreground_pixel); |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9022 unload_color (f, f->output_data.x->border_pixel); |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9023 unload_color (f, f->output_data.x->mouse_pixel); |
|
41837
ca8e9acfffca
(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
Eli Zaretskii <eliz@gnu.org>
parents:
41791
diff
changeset
|
9024 |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9025 if (f->output_data.x->scroll_bar_background_pixel != -1) |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9026 unload_color (f, f->output_data.x->scroll_bar_background_pixel); |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9027 if (f->output_data.x->scroll_bar_foreground_pixel != -1) |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9028 unload_color (f, f->output_data.x->scroll_bar_foreground_pixel); |
|
39618
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
9029 #ifdef USE_TOOLKIT_SCROLL_BARS |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
9030 /* Scrollbar shadow colors. */ |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
9031 if (f->output_data.x->scroll_bar_top_shadow_pixel != -1) |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
9032 unload_color (f, f->output_data.x->scroll_bar_top_shadow_pixel); |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
9033 if (f->output_data.x->scroll_bar_bottom_shadow_pixel != -1) |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
9034 unload_color (f, f->output_data.x->scroll_bar_bottom_shadow_pixel); |
|
6d60a3a33839
(x_create_toolkit_scroll_bar): Try to allocate colors for the shadows,
Miles Bader <miles@gnu.org>
parents:
39586
diff
changeset
|
9035 #endif /* USE_TOOLKIT_SCROLL_BARS */ |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9036 if (f->output_data.x->white_relief.allocated_p) |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9037 unload_color (f, f->output_data.x->white_relief.pixel); |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9038 if (f->output_data.x->black_relief.allocated_p) |
|
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9039 unload_color (f, f->output_data.x->black_relief.pixel); |
|
34318
d302f6935ff8
(x_destroy_window): Call x_free_gcs so that
Gerd Moellmann <gerd@gnu.org>
parents:
34250
diff
changeset
|
9040 |
|
34526
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9041 if (FRAME_FACE_CACHE (f)) |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9042 free_frame_faces (f); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
9043 |
|
34318
d302f6935ff8
(x_destroy_window): Call x_free_gcs so that
Gerd Moellmann <gerd@gnu.org>
parents:
34250
diff
changeset
|
9044 x_free_gcs (f); |
|
14489
9bc700f13f97
(x_connection_signal): Call x_connection_closed properly.
Richard M. Stallman <rms@gnu.org>
parents:
14411
diff
changeset
|
9045 XFlush (FRAME_X_DISPLAY (f)); |
|
9bc700f13f97
(x_connection_signal): Call x_connection_closed properly.
Richard M. Stallman <rms@gnu.org>
parents:
14411
diff
changeset
|
9046 } |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
9047 |
| 17575 | 9048 if (f->output_data.x->saved_menu_event) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9049 xfree (f->output_data.x->saved_menu_event); |
|
17574
7fe6de4949e4
(x_destroy_window): Free saved_menu_event, if any.
Richard M. Stallman <rms@gnu.org>
parents:
17519
diff
changeset
|
9050 |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9051 xfree (f->output_data.x); |
|
34526
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9052 f->output_data.x = NULL; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
9053 |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
9054 if (f == dpyinfo->x_focus_frame) |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
9055 dpyinfo->x_focus_frame = 0; |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
9056 if (f == dpyinfo->x_focus_event_frame) |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
9057 dpyinfo->x_focus_event_frame = 0; |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
9058 if (f == dpyinfo->x_highlight_frame) |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
9059 dpyinfo->x_highlight_frame = 0; |
|
1810
bf618128d973
* xterm.c (x_scrollbar_create): Set the scrollbars to use
Jim Blandy <jimb@redhat.com>
parents:
1803
diff
changeset
|
9060 |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
9061 if (f == dpyinfo->mouse_face_mouse_frame) |
|
6934
e0ab4f59004e
(dumpglyphs): When HL=2, check explicitly for using
Richard M. Stallman <rms@gnu.org>
parents:
6883
diff
changeset
|
9062 { |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
9063 dpyinfo->mouse_face_beg_row |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
9064 = dpyinfo->mouse_face_beg_col = -1; |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
9065 dpyinfo->mouse_face_end_row |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
9066 = dpyinfo->mouse_face_end_col = -1; |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
9067 dpyinfo->mouse_face_window = Qnil; |
|
21017
1ecfba12016a
(XTframe_up_to_date): Check that mouse_face_mouse_frame
Richard M. Stallman <rms@gnu.org>
parents:
20632
diff
changeset
|
9068 dpyinfo->mouse_face_deferred_gc = 0; |
|
1ecfba12016a
(XTframe_up_to_date): Check that mouse_face_mouse_frame
Richard M. Stallman <rms@gnu.org>
parents:
20632
diff
changeset
|
9069 dpyinfo->mouse_face_mouse_frame = 0; |
|
6934
e0ab4f59004e
(dumpglyphs): When HL=2, check explicitly for using
Richard M. Stallman <rms@gnu.org>
parents:
6883
diff
changeset
|
9070 } |
|
6883
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9071 |
|
1810
bf618128d973
* xterm.c (x_scrollbar_create): Set the scrollbars to use
Jim Blandy <jimb@redhat.com>
parents:
1803
diff
changeset
|
9072 UNBLOCK_INPUT; |
| 286 | 9073 } |
|
34526
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9074 |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9075 |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9076 /* Destroy the X window of frame F. */ |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9077 |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9078 void |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9079 x_destroy_window (f) |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9080 struct frame *f; |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9081 { |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9082 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9083 |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9084 /* If a display connection is dead, don't try sending more |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9085 commands to the X server. */ |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9086 if (dpyinfo->display != 0) |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9087 x_free_frame_resources (f); |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9088 |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9089 dpyinfo->reference_count--; |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9090 } |
|
0da25e792d3e
(x_free_frame_resources): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34511
diff
changeset
|
9091 |
| 286 | 9092 |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
9093 /* Setting window manager hints. */ |
|
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
9094 |
|
7210
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9095 /* Set the normal size hints for the window manager, for frame F. |
|
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9096 FLAGS is the flags word to use--or 0 meaning preserve the flags |
|
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9097 that the window now has. |
|
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9098 If USER_POSITION is nonzero, we set the USPosition |
| 49322 | 9099 flag (this is useful when FLAGS is 0). |
| 9100 The GTK version is in gtkutils.c */ | |
| 9101 | |
| 9102 #ifndef USE_GTK | |
| 21514 | 9103 void |
|
7210
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9104 x_wm_set_size_hint (f, flags, user_position) |
| 771 | 9105 struct frame *f; |
|
7210
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9106 long flags; |
|
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9107 int user_position; |
| 286 | 9108 { |
| 9109 XSizeHints size_hints; | |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
9110 |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
9111 #ifdef USE_X_TOOLKIT |
|
6631
eea1789dc6fd
(x_wm_set_size_hint): Add USE_X_TOOLKIT conditional and call
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6626
diff
changeset
|
9112 Arg al[2]; |
|
eea1789dc6fd
(x_wm_set_size_hint): Add USE_X_TOOLKIT conditional and call
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6626
diff
changeset
|
9113 int ac = 0; |
|
eea1789dc6fd
(x_wm_set_size_hint): Add USE_X_TOOLKIT conditional and call
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6626
diff
changeset
|
9114 Dimension widget_width, widget_height; |
| 49322 | 9115 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
9116 |
| 49322 | 9117 Window window = FRAME_OUTER_WINDOW (f); |
| 286 | 9118 |
|
7187
ca0102511d80
(x_wm_set_size_hint): Don't set PMaxSize.
Richard M. Stallman <rms@gnu.org>
parents:
7169
diff
changeset
|
9119 /* Setting PMaxSize caused various problems. */ |
|
ca0102511d80
(x_wm_set_size_hint): Don't set PMaxSize.
Richard M. Stallman <rms@gnu.org>
parents:
7169
diff
changeset
|
9120 size_hints.flags = PResizeInc | PMinSize /* | PMaxSize */; |
| 286 | 9121 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
9122 size_hints.x = f->left_pos; |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
9123 size_hints.y = f->top_pos; |
|
7123
4f2c825cc0f8
(x_wm_set_size_hint): Do set max_height, max_width, and PMaxSize flag.
Richard M. Stallman <rms@gnu.org>
parents:
7122
diff
changeset
|
9124 |
|
6631
eea1789dc6fd
(x_wm_set_size_hint): Add USE_X_TOOLKIT conditional and call
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6626
diff
changeset
|
9125 #ifdef USE_X_TOOLKIT |
|
eea1789dc6fd
(x_wm_set_size_hint): Add USE_X_TOOLKIT conditional and call
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6626
diff
changeset
|
9126 XtSetArg (al[ac], XtNwidth, &widget_width); ac++; |
|
eea1789dc6fd
(x_wm_set_size_hint): Add USE_X_TOOLKIT conditional and call
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6626
diff
changeset
|
9127 XtSetArg (al[ac], XtNheight, &widget_height); ac++; |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9128 XtGetValues (f->output_data.x->widget, al, ac); |
|
6631
eea1789dc6fd
(x_wm_set_size_hint): Add USE_X_TOOLKIT conditional and call
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6626
diff
changeset
|
9129 size_hints.height = widget_height; |
|
eea1789dc6fd
(x_wm_set_size_hint): Add USE_X_TOOLKIT conditional and call
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6626
diff
changeset
|
9130 size_hints.width = widget_width; |
|
eea1789dc6fd
(x_wm_set_size_hint): Add USE_X_TOOLKIT conditional and call
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6626
diff
changeset
|
9131 #else /* not USE_X_TOOLKIT */ |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
9132 size_hints.height = FRAME_PIXEL_HEIGHT (f); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
9133 size_hints.width = FRAME_PIXEL_WIDTH (f); |
|
6631
eea1789dc6fd
(x_wm_set_size_hint): Add USE_X_TOOLKIT conditional and call
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents:
6626
diff
changeset
|
9134 #endif /* not USE_X_TOOLKIT */ |
|
7123
4f2c825cc0f8
(x_wm_set_size_hint): Do set max_height, max_width, and PMaxSize flag.
Richard M. Stallman <rms@gnu.org>
parents:
7122
diff
changeset
|
9135 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
9136 size_hints.width_inc = FRAME_COLUMN_WIDTH (f); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
9137 size_hints.height_inc = FRAME_LINE_HEIGHT (f); |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
9138 size_hints.max_width |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
9139 = FRAME_X_DISPLAY_INFO (f)->width - FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0); |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
9140 size_hints.max_height |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
9141 = FRAME_X_DISPLAY_INFO (f)->height - FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0); |
|
6883
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9142 |
| 12189 | 9143 /* Calculate the base and minimum sizes. |
| 9144 | |
| 9145 (When we use the X toolkit, we don't do it here. | |
| 9146 Instead we copy the values that the widgets are using, below.) */ | |
| 9147 #ifndef USE_X_TOOLKIT | |
|
976
cbdfc337ec8f
* xterm.c (x_wm_hints): New variable.
Jim Blandy <jimb@redhat.com>
parents:
786
diff
changeset
|
9148 { |
|
1127
cd3d59155bf7
* xterm.c (x_wm_set_size_hint): Set the base_width and base_height
Jim Blandy <jimb@redhat.com>
parents:
1077
diff
changeset
|
9149 int base_width, base_height; |
|
6883
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9150 int min_rows = 0, min_cols = 0; |
|
1127
cd3d59155bf7
* xterm.c (x_wm_set_size_hint): Set the base_width and base_height
Jim Blandy <jimb@redhat.com>
parents:
1077
diff
changeset
|
9151 |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
9152 base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0); |
|
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
9153 base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0); |
|
1127
cd3d59155bf7
* xterm.c (x_wm_set_size_hint): Set the base_width and base_height
Jim Blandy <jimb@redhat.com>
parents:
1077
diff
changeset
|
9154 |
|
6883
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9155 check_frame_size (f, &min_rows, &min_cols); |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9156 |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9157 /* The window manager uses the base width hints to calculate the |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9158 current number of rows and columns in the frame while |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9159 resizing; min_width and min_height aren't useful for this |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9160 purpose, since they might not give the dimensions for a |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9161 zero-row, zero-column frame. |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
9162 |
|
6883
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9163 We use the base_width and base_height members if we have |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9164 them; otherwise, we set the min_width and min_height members |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9165 to the size for a zero x zero frame. */ |
|
1127
cd3d59155bf7
* xterm.c (x_wm_set_size_hint): Set the base_width and base_height
Jim Blandy <jimb@redhat.com>
parents:
1077
diff
changeset
|
9166 |
|
cd3d59155bf7
* xterm.c (x_wm_set_size_hint): Set the base_width and base_height
Jim Blandy <jimb@redhat.com>
parents:
1077
diff
changeset
|
9167 #ifdef HAVE_X11R4 |
|
6883
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9168 size_hints.flags |= PBaseSize; |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9169 size_hints.base_width = base_width; |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9170 size_hints.base_height = base_height; |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9171 size_hints.min_width = base_width + min_cols * size_hints.width_inc; |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9172 size_hints.min_height = base_height + min_rows * size_hints.height_inc; |
|
1127
cd3d59155bf7
* xterm.c (x_wm_set_size_hint): Set the base_width and base_height
Jim Blandy <jimb@redhat.com>
parents:
1077
diff
changeset
|
9173 #else |
|
6883
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9174 size_hints.min_width = base_width; |
|
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9175 size_hints.min_height = base_height; |
|
1127
cd3d59155bf7
* xterm.c (x_wm_set_size_hint): Set the base_width and base_height
Jim Blandy <jimb@redhat.com>
parents:
1077
diff
changeset
|
9176 #endif |
|
976
cbdfc337ec8f
* xterm.c (x_wm_hints): New variable.
Jim Blandy <jimb@redhat.com>
parents:
786
diff
changeset
|
9177 } |
| 286 | 9178 |
| 12189 | 9179 /* If we don't need the old flags, we don't need the old hint at all. */ |
|
7210
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9180 if (flags) |
| 286 | 9181 { |
| 12189 | 9182 size_hints.flags |= flags; |
| 9183 goto no_read; | |
| 9184 } | |
| 9185 #endif /* not USE_X_TOOLKIT */ | |
| 9186 | |
| 9187 { | |
| 9188 XSizeHints hints; /* Sometimes I hate X Windows... */ | |
| 9189 long supplied_return; | |
| 9190 int value; | |
|
7210
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9191 |
|
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9192 #ifdef HAVE_X11R4 |
| 12189 | 9193 value = XGetWMNormalHints (FRAME_X_DISPLAY (f), window, &hints, |
| 9194 &supplied_return); | |
|
7210
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9195 #else |
| 12189 | 9196 value = XGetNormalHints (FRAME_X_DISPLAY (f), window, &hints); |
| 9197 #endif | |
| 9198 | |
| 9199 #ifdef USE_X_TOOLKIT | |
| 9200 size_hints.base_height = hints.base_height; | |
| 9201 size_hints.base_width = hints.base_width; | |
| 9202 size_hints.min_height = hints.min_height; | |
| 9203 size_hints.min_width = hints.min_width; | |
|
7210
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9204 #endif |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
9205 |
| 12189 | 9206 if (flags) |
| 9207 size_hints.flags |= flags; | |
| 9208 else | |
| 9209 { | |
| 9210 if (value == 0) | |
| 9211 hints.flags = 0; | |
| 9212 if (hints.flags & PSize) | |
| 9213 size_hints.flags |= PSize; | |
| 9214 if (hints.flags & PPosition) | |
| 9215 size_hints.flags |= PPosition; | |
| 9216 if (hints.flags & USPosition) | |
| 9217 size_hints.flags |= USPosition; | |
| 9218 if (hints.flags & USSize) | |
| 9219 size_hints.flags |= USSize; | |
| 9220 } | |
| 9221 } | |
| 9222 | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9223 #ifndef USE_X_TOOLKIT |
| 12189 | 9224 no_read: |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9225 #endif |
|
6883
77ceede38423
(x_make_frame_visible): Don't call XMapSubwindows.
Richard M. Stallman <rms@gnu.org>
parents:
6791
diff
changeset
|
9226 |
|
7210
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9227 #ifdef PWinGravity |
|
51213
791af636af55
Make (several) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51129
diff
changeset
|
9228 size_hints.win_gravity = f->win_gravity; |
|
7210
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9229 size_hints.flags |= PWinGravity; |
|
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9230 |
|
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9231 if (user_position) |
|
4630
70247ce8b381
(x_wm_set_size_hint): New args spec_x and spec_y.
Richard M. Stallman <rms@gnu.org>
parents:
4493
diff
changeset
|
9232 { |
|
7210
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9233 size_hints.flags &= ~ PPosition; |
|
682ff6213c36
(x_wm_set_size_hint): Always set PWinGravity.
Richard M. Stallman <rms@gnu.org>
parents:
7187
diff
changeset
|
9234 size_hints.flags |= USPosition; |
|
4630
70247ce8b381
(x_wm_set_size_hint): New args spec_x and spec_y.
Richard M. Stallman <rms@gnu.org>
parents:
4493
diff
changeset
|
9235 } |
|
4777
21ed9c9bb210
(w_wn_set_size_hint): Make recent window gravity addition
Brian Fox <bfox@gnu.org>
parents:
4696
diff
changeset
|
9236 #endif /* PWinGravity */ |
|
4630
70247ce8b381
(x_wm_set_size_hint): New args spec_x and spec_y.
Richard M. Stallman <rms@gnu.org>
parents:
4493
diff
changeset
|
9237 |
|
1127
cd3d59155bf7
* xterm.c (x_wm_set_size_hint): Set the base_width and base_height
Jim Blandy <jimb@redhat.com>
parents:
1077
diff
changeset
|
9238 #ifdef HAVE_X11R4 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
9239 XSetWMNormalHints (FRAME_X_DISPLAY (f), window, &size_hints); |
|
1127
cd3d59155bf7
* xterm.c (x_wm_set_size_hint): Set the base_width and base_height
Jim Blandy <jimb@redhat.com>
parents:
1077
diff
changeset
|
9240 #else |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
9241 XSetNormalHints (FRAME_X_DISPLAY (f), window, &size_hints); |
|
1127
cd3d59155bf7
* xterm.c (x_wm_set_size_hint): Set the base_width and base_height
Jim Blandy <jimb@redhat.com>
parents:
1077
diff
changeset
|
9242 #endif |
| 286 | 9243 } |
| 49322 | 9244 #endif /* not USE_GTK */ |
| 286 | 9245 |
| 9246 /* Used for IconicState or NormalState */ | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9247 |
| 21514 | 9248 void |
| 771 | 9249 x_wm_set_window_state (f, state) |
| 9250 struct frame *f; | |
| 286 | 9251 int state; |
| 9252 { | |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
9253 #ifdef USE_X_TOOLKIT |
|
7602
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
9254 Arg al[1]; |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
9255 |
|
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
9256 XtSetArg (al[0], XtNinitialState, state); |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9257 XtSetValues (f->output_data.x->widget, al, 1); |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
9258 #else /* not USE_X_TOOLKIT */ |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
9259 Window window = FRAME_X_WINDOW (f); |
| 286 | 9260 |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9261 f->output_data.x->wm_hints.flags |= StateHint; |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9262 f->output_data.x->wm_hints.initial_state = state; |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9263 |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9264 XSetWMHints (FRAME_X_DISPLAY (f), window, &f->output_data.x->wm_hints); |
|
7602
136819b017fc
(x_wm_set_window_state) [USE_X_TOOLKIT]: Use XtSetValues.
Richard M. Stallman <rms@gnu.org>
parents:
7508
diff
changeset
|
9265 #endif /* not USE_X_TOOLKIT */ |
| 286 | 9266 } |
| 9267 | |
| 21514 | 9268 void |
|
9542
f8b7a65a94bc
(x_bitmap_icon): Allow bitmap to come from file.
Richard M. Stallman <rms@gnu.org>
parents:
9537
diff
changeset
|
9269 x_wm_set_icon_pixmap (f, pixmap_id) |
| 771 | 9270 struct frame *f; |
|
9542
f8b7a65a94bc
(x_bitmap_icon): Allow bitmap to come from file.
Richard M. Stallman <rms@gnu.org>
parents:
9537
diff
changeset
|
9271 int pixmap_id; |
| 286 | 9272 { |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
9273 Pixmap icon_pixmap, icon_mask; |
|
15117
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
9274 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9275 #ifndef USE_X_TOOLKIT |
| 49322 | 9276 Window window = FRAME_OUTER_WINDOW (f); |
|
7806
ef7a60d59543
(x_wm_set_icon_position, x_wm_set_icon_pixmap):
Richard M. Stallman <rms@gnu.org>
parents:
7801
diff
changeset
|
9277 #endif |
| 286 | 9278 |
|
9542
f8b7a65a94bc
(x_bitmap_icon): Allow bitmap to come from file.
Richard M. Stallman <rms@gnu.org>
parents:
9537
diff
changeset
|
9279 if (pixmap_id > 0) |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
9280 { |
|
15117
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
9281 icon_pixmap = x_bitmap_pixmap (f, pixmap_id); |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9282 f->output_data.x->wm_hints.icon_pixmap = icon_pixmap; |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
9283 icon_mask = x_bitmap_mask (f, pixmap_id); |
|
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
9284 f->output_data.x->wm_hints.icon_mask = icon_mask; |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
9285 } |
|
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
9286 else |
|
12966
ce60b1a64399
(x_wm_set_icon_pixmap): If trying to turn off icon pixmap, do nothing.
Richard M. Stallman <rms@gnu.org>
parents:
12771
diff
changeset
|
9287 { |
|
ce60b1a64399
(x_wm_set_icon_pixmap): If trying to turn off icon pixmap, do nothing.
Richard M. Stallman <rms@gnu.org>
parents:
12771
diff
changeset
|
9288 /* It seems there is no way to turn off use of an icon pixmap. |
|
ce60b1a64399
(x_wm_set_icon_pixmap): If trying to turn off icon pixmap, do nothing.
Richard M. Stallman <rms@gnu.org>
parents:
12771
diff
changeset
|
9289 The following line does it, only if no icon has yet been created, |
|
ce60b1a64399
(x_wm_set_icon_pixmap): If trying to turn off icon pixmap, do nothing.
Richard M. Stallman <rms@gnu.org>
parents:
12771
diff
changeset
|
9290 for some window managers. But with mwm it crashes. |
|
ce60b1a64399
(x_wm_set_icon_pixmap): If trying to turn off icon pixmap, do nothing.
Richard M. Stallman <rms@gnu.org>
parents:
12771
diff
changeset
|
9291 Some people say it should clear the IconPixmapHint bit in this case, |
|
ce60b1a64399
(x_wm_set_icon_pixmap): If trying to turn off icon pixmap, do nothing.
Richard M. Stallman <rms@gnu.org>
parents:
12771
diff
changeset
|
9292 but that doesn't work, and the X consortium said it isn't the |
|
ce60b1a64399
(x_wm_set_icon_pixmap): If trying to turn off icon pixmap, do nothing.
Richard M. Stallman <rms@gnu.org>
parents:
12771
diff
changeset
|
9293 right thing at all. Since there is no way to win, |
|
ce60b1a64399
(x_wm_set_icon_pixmap): If trying to turn off icon pixmap, do nothing.
Richard M. Stallman <rms@gnu.org>
parents:
12771
diff
changeset
|
9294 best to explicitly give up. */ |
|
ce60b1a64399
(x_wm_set_icon_pixmap): If trying to turn off icon pixmap, do nothing.
Richard M. Stallman <rms@gnu.org>
parents:
12771
diff
changeset
|
9295 #if 0 |
|
ce60b1a64399
(x_wm_set_icon_pixmap): If trying to turn off icon pixmap, do nothing.
Richard M. Stallman <rms@gnu.org>
parents:
12771
diff
changeset
|
9296 f->output_data.x->wm_hints.icon_pixmap = None; |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
9297 f->output_data.x->wm_hints.icon_mask = None; |
|
12966
ce60b1a64399
(x_wm_set_icon_pixmap): If trying to turn off icon pixmap, do nothing.
Richard M. Stallman <rms@gnu.org>
parents:
12771
diff
changeset
|
9298 #else |
|
ce60b1a64399
(x_wm_set_icon_pixmap): If trying to turn off icon pixmap, do nothing.
Richard M. Stallman <rms@gnu.org>
parents:
12771
diff
changeset
|
9299 return; |
|
ce60b1a64399
(x_wm_set_icon_pixmap): If trying to turn off icon pixmap, do nothing.
Richard M. Stallman <rms@gnu.org>
parents:
12771
diff
changeset
|
9300 #endif |
|
ce60b1a64399
(x_wm_set_icon_pixmap): If trying to turn off icon pixmap, do nothing.
Richard M. Stallman <rms@gnu.org>
parents:
12771
diff
changeset
|
9301 } |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9302 |
|
15117
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
9303 #ifdef USE_X_TOOLKIT /* same as in x_wm_set_window_state. */ |
|
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
9304 |
|
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
9305 { |
|
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
9306 Arg al[1]; |
|
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
9307 XtSetArg (al[0], XtNiconPixmap, icon_pixmap); |
|
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
9308 XtSetValues (f->output_data.x->widget, al, 1); |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
9309 XtSetArg (al[0], XtNiconMask, icon_mask); |
|
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
9310 XtSetValues (f->output_data.x->widget, al, 1); |
|
15117
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
9311 } |
|
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
9312 |
|
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
9313 #else /* not USE_X_TOOLKIT */ |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
9314 |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
9315 f->output_data.x->wm_hints.flags |= (IconPixmapHint | IconMaskHint); |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9316 XSetWMHints (FRAME_X_DISPLAY (f), window, &f->output_data.x->wm_hints); |
|
15117
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
9317 |
|
21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
Richard M. Stallman <rms@gnu.org>
parents:
15080
diff
changeset
|
9318 #endif /* not USE_X_TOOLKIT */ |
| 286 | 9319 } |
| 9320 | |
| 21514 | 9321 void |
| 771 | 9322 x_wm_set_icon_position (f, icon_x, icon_y) |
| 9323 struct frame *f; | |
| 286 | 9324 int icon_x, icon_y; |
| 9325 { | |
|
49644
834df49192b0
Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
9326 Window window = FRAME_OUTER_WINDOW (f); |
| 286 | 9327 |
|
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9328 f->output_data.x->wm_hints.flags |= IconPositionHint; |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9329 f->output_data.x->wm_hints.icon_x = icon_x; |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9330 f->output_data.x->wm_hints.icon_y = icon_y; |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9331 |
|
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12657
diff
changeset
|
9332 XSetWMHints (FRAME_X_DISPLAY (f), window, &f->output_data.x->wm_hints); |
| 286 | 9333 } |
| 9334 | |
| 9335 | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9336 /*********************************************************************** |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9337 Fonts |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9338 ***********************************************************************/ |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9339 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9340 /* Return a pointer to struct font_info of font FONT_IDX of frame F. */ |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9341 |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9342 struct font_info * |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9343 x_get_font_info (f, font_idx) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9344 FRAME_PTR f; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9345 int font_idx; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9346 { |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9347 return (FRAME_X_FONT_TABLE (f) + font_idx); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9348 } |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9349 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9350 |
|
35367
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9351 /* Return a list of names of available fonts matching PATTERN on frame F. |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9352 |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9353 If SIZE is > 0, it is the size (maximum bounds width) of fonts |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9354 to be listed. |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9355 |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9356 SIZE < 0 means include scalable fonts. |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9357 |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9358 Frame F null means we have not yet created any frame on X, and |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9359 consult the first display in x_display_list. MAXNAMES sets a limit |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9360 on how many fonts to match. */ |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9361 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9362 Lisp_Object |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9363 x_list_fonts (f, pattern, size, maxnames) |
|
35367
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9364 struct frame *f; |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9365 Lisp_Object pattern; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9366 int size; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9367 int maxnames; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9368 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9369 Lisp_Object list = Qnil, patterns, newlist = Qnil, key = Qnil; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9370 Lisp_Object tem, second_best; |
|
35367
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9371 struct x_display_info *dpyinfo |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9372 = f ? FRAME_X_DISPLAY_INFO (f) : x_display_list; |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9373 Display *dpy = dpyinfo->display; |
|
22503
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9374 int try_XLoadQueryFont = 0; |
|
24633
c7d905dca6ba
(x_list_fonts): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
24618
diff
changeset
|
9375 int count; |
|
53038
ea521a9007e2
(x_list_fonts): Fix excluding of auto-scaled fonts.
Kenichi Handa <handa@m17n.org>
parents:
53021
diff
changeset
|
9376 int allow_auto_scaled_font = 0; |
|
35367
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9377 |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9378 if (size < 0) |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9379 { |
|
53038
ea521a9007e2
(x_list_fonts): Fix excluding of auto-scaled fonts.
Kenichi Handa <handa@m17n.org>
parents:
53021
diff
changeset
|
9380 allow_auto_scaled_font = 1; |
|
35367
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9381 size = 0; |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9382 } |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9383 |
|
19447
34099ec680df
(x_list_fonts): Adjusted for the name change of
Kenichi Handa <handa@m17n.org>
parents:
19276
diff
changeset
|
9384 patterns = Fassoc (pattern, Valternate_fontname_alist); |
|
18347
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9385 if (NILP (patterns)) |
|
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9386 patterns = Fcons (pattern, Qnil); |
|
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9387 |
|
22503
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9388 if (maxnames == 1 && !size) |
|
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9389 /* We can return any single font matching PATTERN. */ |
|
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9390 try_XLoadQueryFont = 1; |
|
19062
9cc02044117d
(x_list_fonts): Request at least 10 fonts by XListFonts.
Kenichi Handa <handa@m17n.org>
parents:
19060
diff
changeset
|
9391 |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9392 for (; CONSP (patterns); patterns = XCDR (patterns)) |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9393 { |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9394 int num_fonts; |
|
29600
a377acd06ea8
(x_frame_of_widget): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29536
diff
changeset
|
9395 char **names = NULL; |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9396 |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9397 pattern = XCAR (patterns); |
|
19060
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9398 /* See if we cached the result for this particular query. |
|
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9399 The cache is an alist of the form: |
|
35367
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9400 ((((PATTERN . MAXNAMES) . SCALABLE) (FONTNAME . WIDTH) ...) ...) */ |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9401 tem = XCDR (dpyinfo->name_list_element); |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9402 key = Fcons (Fcons (pattern, make_number (maxnames)), |
|
53038
ea521a9007e2
(x_list_fonts): Fix excluding of auto-scaled fonts.
Kenichi Handa <handa@m17n.org>
parents:
53021
diff
changeset
|
9403 allow_auto_scaled_font ? Qt : Qnil); |
|
35367
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9404 list = Fassoc (key, tem); |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9405 if (!NILP (list)) |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9406 { |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9407 list = Fcdr_safe (list); |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9408 /* We have a cashed list. Don't have to get the list again. */ |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9409 goto label_cached; |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9410 } |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9411 |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9412 /* At first, put PATTERN in the cache. */ |
|
22503
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9413 |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9414 BLOCK_INPUT; |
|
24618
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9415 count = x_catch_errors (dpy); |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9416 |
|
22503
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9417 if (try_XLoadQueryFont) |
|
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9418 { |
|
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9419 XFontStruct *font; |
|
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9420 unsigned long value; |
|
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9421 |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
9422 font = XLoadQueryFont (dpy, SDATA (pattern)); |
|
24618
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9423 if (x_had_errors_p (dpy)) |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9424 { |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9425 /* This error is perhaps due to insufficient memory on X |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9426 server. Let's just ignore it. */ |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9427 font = NULL; |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9428 x_clear_errors (dpy); |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9429 } |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9430 |
|
22503
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9431 if (font |
|
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9432 && XGetFontProperty (font, XA_FONT, &value)) |
|
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9433 { |
|
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9434 char *name = (char *) XGetAtomName (dpy, (Atom) value); |
|
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9435 int len = strlen (name); |
|
22530
6d2e22a16952
(x_list_fonts): Keep alloca usage simple.
Karl Heuer <kwzh@gnu.org>
parents:
22522
diff
changeset
|
9436 char *tmp; |
|
22503
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9437 |
|
23095
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9438 /* If DXPC (a Differential X Protocol Compressor) |
|
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9439 Ver.3.7 is running, XGetAtomName will return null |
|
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9440 string. We must avoid such a name. */ |
|
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9441 if (len == 0) |
|
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9442 try_XLoadQueryFont = 0; |
|
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9443 else |
|
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9444 { |
|
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9445 num_fonts = 1; |
|
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9446 names = (char **) alloca (sizeof (char *)); |
|
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9447 /* Some systems only allow alloca assigned to a |
|
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9448 simple var. */ |
|
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9449 tmp = (char *) alloca (len + 1); names[0] = tmp; |
|
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9450 bcopy (name, names[0], len + 1); |
|
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9451 XFree (name); |
|
4e83e072cd97
(x_list_fonts): Work-around for the case XGetAtomName
Kenichi Handa <handa@m17n.org>
parents:
23037
diff
changeset
|
9452 } |
|
22503
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9453 } |
|
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9454 else |
|
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9455 try_XLoadQueryFont = 0; |
|
22943
5493321d4526
(x_list_fonts): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
22907
diff
changeset
|
9456 |
|
5493321d4526
(x_list_fonts): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
22907
diff
changeset
|
9457 if (font) |
|
5493321d4526
(x_list_fonts): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
22907
diff
changeset
|
9458 XFreeFont (dpy, font); |
|
22503
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9459 } |
|
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9460 |
|
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9461 if (!try_XLoadQueryFont) |
|
24618
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9462 { |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9463 /* We try at least 10 fonts because XListFonts will return |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9464 auto-scaled fonts at the head. */ |
|
49859
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9465 if (maxnames < 0) |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9466 { |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9467 int limit; |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9468 |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9469 for (limit = 500;;) |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9470 { |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9471 names = XListFonts (dpy, SDATA (pattern), limit, &num_fonts); |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9472 if (num_fonts == limit) |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9473 { |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9474 BLOCK_INPUT; |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9475 XFreeFontNames (names); |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9476 UNBLOCK_INPUT; |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9477 limit *= 2; |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9478 } |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9479 else |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9480 break; |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9481 } |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9482 } |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9483 else |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9484 names = XListFonts (dpy, SDATA (pattern), max (maxnames, 10), |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9485 &num_fonts); |
|
c6bacc76cfb6
* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49651
diff
changeset
|
9486 |
|
24618
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9487 if (x_had_errors_p (dpy)) |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9488 { |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9489 /* This error is perhaps due to insufficient memory on X |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9490 server. Let's just ignore it. */ |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9491 names = NULL; |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9492 x_clear_errors (dpy); |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9493 } |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9494 } |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9495 |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9496 x_uncatch_errors (dpy, count); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9497 UNBLOCK_INPUT; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9498 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9499 if (names) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9500 { |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9501 int i; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9502 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9503 /* Make a list of all the fonts we got back. |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9504 Store that in the font cache for the display. */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9505 for (i = 0; i < num_fonts; i++) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9506 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9507 int width = 0; |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9508 char *p = names[i]; |
|
53038
ea521a9007e2
(x_list_fonts): Fix excluding of auto-scaled fonts.
Kenichi Handa <handa@m17n.org>
parents:
53021
diff
changeset
|
9509 int average_width = -1, resx = 0, dashes = 0; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
9510 |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9511 /* Count the number of dashes in NAMES[I]. If there are |
|
53038
ea521a9007e2
(x_list_fonts): Fix excluding of auto-scaled fonts.
Kenichi Handa <handa@m17n.org>
parents:
53021
diff
changeset
|
9512 14 dashes, the field value following 9th dash |
|
ea521a9007e2
(x_list_fonts): Fix excluding of auto-scaled fonts.
Kenichi Handa <handa@m17n.org>
parents:
53021
diff
changeset
|
9513 (RESOLUTION_X) is nonzero, and the field value |
|
ea521a9007e2
(x_list_fonts): Fix excluding of auto-scaled fonts.
Kenichi Handa <handa@m17n.org>
parents:
53021
diff
changeset
|
9514 following 12th dash (AVERAGE_WIDTH) is 0, this is a |
|
ea521a9007e2
(x_list_fonts): Fix excluding of auto-scaled fonts.
Kenichi Handa <handa@m17n.org>
parents:
53021
diff
changeset
|
9515 auto-scaled font which is usually too ugly to be used |
|
ea521a9007e2
(x_list_fonts): Fix excluding of auto-scaled fonts.
Kenichi Handa <handa@m17n.org>
parents:
53021
diff
changeset
|
9516 for editing. Let's ignore it. */ |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9517 while (*p) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9518 if (*p++ == '-') |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9519 { |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9520 dashes++; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9521 if (dashes == 7) /* PIXEL_SIZE field */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9522 width = atoi (p); |
|
53038
ea521a9007e2
(x_list_fonts): Fix excluding of auto-scaled fonts.
Kenichi Handa <handa@m17n.org>
parents:
53021
diff
changeset
|
9523 else if (dashes == 9) |
|
ea521a9007e2
(x_list_fonts): Fix excluding of auto-scaled fonts.
Kenichi Handa <handa@m17n.org>
parents:
53021
diff
changeset
|
9524 resx = atoi (p); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9525 else if (dashes == 12) /* AVERAGE_WIDTH field */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9526 average_width = atoi (p); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9527 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
9528 |
|
53038
ea521a9007e2
(x_list_fonts): Fix excluding of auto-scaled fonts.
Kenichi Handa <handa@m17n.org>
parents:
53021
diff
changeset
|
9529 if (allow_auto_scaled_font |
|
ea521a9007e2
(x_list_fonts): Fix excluding of auto-scaled fonts.
Kenichi Handa <handa@m17n.org>
parents:
53021
diff
changeset
|
9530 || dashes < 14 || average_width != 0 || resx == 0) |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9531 { |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9532 tem = build_string (names[i]); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9533 if (NILP (Fassoc (tem, list))) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9534 { |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9535 if (STRINGP (Vx_pixel_size_width_font_regexp) |
|
18191
3c353983bba9
(x_list_fonts): fast_c_string_match_ignore_case renamed.
Richard M. Stallman <rms@gnu.org>
parents:
18188
diff
changeset
|
9536 && ((fast_c_string_match_ignore_case |
|
3c353983bba9
(x_list_fonts): fast_c_string_match_ignore_case renamed.
Richard M. Stallman <rms@gnu.org>
parents:
18188
diff
changeset
|
9537 (Vx_pixel_size_width_font_regexp, names[i])) |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9538 >= 0)) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9539 /* We can set the value of PIXEL_SIZE to the |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9540 width of this font. */ |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9541 list = Fcons (Fcons (tem, make_number (width)), list); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9542 else |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9543 /* For the moment, width is not known. */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9544 list = Fcons (Fcons (tem, Qnil), list); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9545 } |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9546 } |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9547 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
9548 |
|
22503
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9549 if (!try_XLoadQueryFont) |
|
38246
b93fb0eb254d
(x_list_fonts): Make sure XFreeFont is called
Gerd Moellmann <gerd@gnu.org>
parents:
38094
diff
changeset
|
9550 { |
|
b93fb0eb254d
(x_list_fonts): Make sure XFreeFont is called
Gerd Moellmann <gerd@gnu.org>
parents:
38094
diff
changeset
|
9551 BLOCK_INPUT; |
|
b93fb0eb254d
(x_list_fonts): Make sure XFreeFont is called
Gerd Moellmann <gerd@gnu.org>
parents:
38094
diff
changeset
|
9552 XFreeFontNames (names); |
|
b93fb0eb254d
(x_list_fonts): Make sure XFreeFont is called
Gerd Moellmann <gerd@gnu.org>
parents:
38094
diff
changeset
|
9553 UNBLOCK_INPUT; |
|
b93fb0eb254d
(x_list_fonts): Make sure XFreeFont is called
Gerd Moellmann <gerd@gnu.org>
parents:
38094
diff
changeset
|
9554 } |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9555 } |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9556 |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9557 /* Now store the result in the cache. */ |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9558 XSETCDR (dpyinfo->name_list_element, |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9559 Fcons (Fcons (key, list), XCDR (dpyinfo->name_list_element))); |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9560 |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9561 label_cached: |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9562 if (NILP (list)) continue; /* Try the remaining alternatives. */ |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9563 |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9564 newlist = second_best = Qnil; |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9565 /* 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:
25633
diff
changeset
|
9566 for (; CONSP (list); list = XCDR (list)) |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9567 { |
|
19060
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9568 int found_size; |
|
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9569 |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9570 tem = XCAR (list); |
|
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9571 |
|
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9572 if (!CONSP (tem) || NILP (XCAR (tem))) |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9573 continue; |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9574 if (!size) |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9575 { |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9576 newlist = Fcons (XCAR (tem), newlist); |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9577 continue; |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9578 } |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9579 |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9580 if (!INTEGERP (XCDR (tem))) |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9581 { |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9582 /* Since we have not yet known the size of this font, we |
|
35367
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9583 must try slow function call XLoadQueryFont. */ |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9584 XFontStruct *thisinfo; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9585 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9586 BLOCK_INPUT; |
|
24618
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9587 count = x_catch_errors (dpy); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9588 thisinfo = XLoadQueryFont (dpy, |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
9589 SDATA (XCAR (tem))); |
|
24618
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9590 if (x_had_errors_p (dpy)) |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9591 { |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9592 /* This error is perhaps due to insufficient memory on X |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9593 server. Let's just ignore it. */ |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9594 thisinfo = NULL; |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9595 x_clear_errors (dpy); |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9596 } |
|
b18f51ec1b6c
Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24561
diff
changeset
|
9597 x_uncatch_errors (dpy, count); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9598 UNBLOCK_INPUT; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9599 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9600 if (thisinfo) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9601 { |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9602 XSETCDR (tem, |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9603 (thisinfo->min_bounds.width == 0 |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9604 ? make_number (0) |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9605 : make_number (thisinfo->max_bounds.width))); |
|
38246
b93fb0eb254d
(x_list_fonts): Make sure XFreeFont is called
Gerd Moellmann <gerd@gnu.org>
parents:
38094
diff
changeset
|
9606 BLOCK_INPUT; |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9607 XFreeFont (dpy, thisinfo); |
|
38246
b93fb0eb254d
(x_list_fonts): Make sure XFreeFont is called
Gerd Moellmann <gerd@gnu.org>
parents:
38094
diff
changeset
|
9608 UNBLOCK_INPUT; |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9609 } |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9610 else |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9611 /* For unknown reason, the previous call of XListFont had |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9612 returned a font which can't be opened. Record the size |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9613 as 0 not to try to open it again. */ |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9614 XSETCDR (tem, make_number (0)); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9615 } |
|
19060
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9616 |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9617 found_size = XINT (XCDR (tem)); |
|
19060
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9618 if (found_size == size) |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9619 newlist = Fcons (XCAR (tem), newlist); |
|
19060
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9620 else if (found_size > 0) |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9621 { |
|
19060
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9622 if (NILP (second_best)) |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9623 second_best = tem; |
|
19060
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9624 else if (found_size < size) |
|
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9625 { |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9626 if (XINT (XCDR (second_best)) > size |
|
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9627 || XINT (XCDR (second_best)) < found_size) |
|
19060
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9628 second_best = tem; |
|
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9629 } |
|
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9630 else |
|
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9631 { |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9632 if (XINT (XCDR (second_best)) > size |
|
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9633 && XINT (XCDR (second_best)) > found_size) |
|
19060
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9634 second_best = tem; |
|
7b362a9bf8e9
(x_list_fonts): Reject a font whose min_bounds.width is 0.
Richard M. Stallman <rms@gnu.org>
parents:
19027
diff
changeset
|
9635 } |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9636 } |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9637 } |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9638 if (!NILP (newlist)) |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9639 break; |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9640 else if (!NILP (second_best)) |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9641 { |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9642 newlist = Fcons (XCAR (second_best), Qnil); |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9643 break; |
|
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9644 } |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9645 } |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9646 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9647 return newlist; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
9648 } |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9649 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9650 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9651 #if GLYPH_DEBUG |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9652 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9653 /* Check that FONT is valid on frame F. It is if it can be found in F's |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9654 font table. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9655 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9656 static void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9657 x_check_font (f, font) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9658 struct frame *f; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9659 XFontStruct *font; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9660 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9661 int i; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9662 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9663 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9664 xassert (font != NULL); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9665 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9666 for (i = 0; i < dpyinfo->n_fonts; i++) |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
9667 if (dpyinfo->font_table[i].name |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9668 && font == dpyinfo->font_table[i].font) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9669 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9670 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9671 xassert (i < dpyinfo->n_fonts); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9672 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9673 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9674 #endif /* GLYPH_DEBUG != 0 */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9675 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9676 /* Set *W to the minimum width, *H to the minimum font height of FONT. |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9677 Note: There are (broken) X fonts out there with invalid XFontStruct |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9678 min_bounds contents. For example, handa@etl.go.jp reports that |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9679 "-adobe-courier-medium-r-normal--*-180-*-*-m-*-iso8859-1" fonts |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9680 have font->min_bounds.width == 0. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9681 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9682 static INLINE void |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9683 x_font_min_bounds (font, w, h) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9684 XFontStruct *font; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9685 int *w, *h; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9686 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9687 *h = FONT_HEIGHT (font); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9688 *w = font->min_bounds.width; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9689 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9690 /* Try to handle the case where FONT->min_bounds has invalid |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9691 contents. Since the only font known to have invalid min_bounds |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9692 is fixed-width, use max_bounds if min_bounds seems to be invalid. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9693 if (*w <= 0) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9694 *w = font->max_bounds.width; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9695 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9696 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9697 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9698 /* Compute the smallest character width and smallest font height over |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9699 all fonts available on frame F. Set the members smallest_char_width |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9700 and smallest_font_height in F's x_display_info structure to |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9701 the values computed. Value is non-zero if smallest_font_height or |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9702 smallest_char_width become smaller than they were before. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9703 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9704 static int |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9705 x_compute_min_glyph_bounds (f) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9706 struct frame *f; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9707 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9708 int i; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9709 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9710 XFontStruct *font; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9711 int old_width = dpyinfo->smallest_char_width; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9712 int old_height = dpyinfo->smallest_font_height; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
9713 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9714 dpyinfo->smallest_font_height = 100000; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9715 dpyinfo->smallest_char_width = 100000; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
9716 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9717 for (i = 0; i < dpyinfo->n_fonts; ++i) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9718 if (dpyinfo->font_table[i].name) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9719 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9720 struct font_info *fontp = dpyinfo->font_table + i; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9721 int w, h; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
9722 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9723 font = (XFontStruct *) fontp->font; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9724 xassert (font != (XFontStruct *) ~0); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9725 x_font_min_bounds (font, &w, &h); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
9726 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9727 dpyinfo->smallest_font_height = min (dpyinfo->smallest_font_height, h); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9728 dpyinfo->smallest_char_width = min (dpyinfo->smallest_char_width, w); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9729 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9730 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9731 xassert (dpyinfo->smallest_char_width > 0 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9732 && dpyinfo->smallest_font_height > 0); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9733 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9734 return (dpyinfo->n_fonts == 1 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9735 || dpyinfo->smallest_char_width < old_width |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9736 || dpyinfo->smallest_font_height < old_height); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9737 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9738 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9739 |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9740 /* Load font named FONTNAME of the size SIZE for frame F, and return a |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9741 pointer to the structure font_info while allocating it dynamically. |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9742 If SIZE is 0, load any size of font. |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9743 If loading is failed, return NULL. */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9744 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9745 struct font_info * |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9746 x_load_font (f, fontname, size) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9747 struct frame *f; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9748 register char *fontname; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9749 int size; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9750 { |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9751 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9752 Lisp_Object font_names; |
|
24484
d4ee4399e999
(x_list_fonts): Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24224
diff
changeset
|
9753 int count; |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9754 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9755 /* Get a list of all the fonts that match this name. Once we |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9756 have a list of matching fonts, we compare them against the fonts |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9757 we already have by comparing names. */ |
|
22503
104e277d77d3
(x_list_fonts): If SIZE is zero and MAXNAMES is 1, use
Kenichi Handa <handa@m17n.org>
parents:
22400
diff
changeset
|
9758 font_names = x_list_fonts (f, build_string (fontname), size, 1); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9759 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9760 if (!NILP (font_names)) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9761 { |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9762 Lisp_Object tail; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9763 int i; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9764 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9765 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:
25633
diff
changeset
|
9766 for (tail = font_names; CONSP (tail); tail = XCDR (tail)) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9767 if (dpyinfo->font_table[i].name |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9768 && (!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
|
9769 SDATA (XCAR (tail))) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9770 || !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
|
9771 SDATA (XCAR (tail))))) |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9772 return (dpyinfo->font_table + i); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9773 } |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9774 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9775 /* Load the font and add it to the table. */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9776 { |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9777 char *full_name; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9778 XFontStruct *font; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9779 struct font_info *fontp; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9780 unsigned long value; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9781 int i; |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9782 |
|
18347
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9783 /* If we have found fonts by x_list_font, load one of them. If |
|
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9784 not, we still try to load a font by the name given as FONTNAME |
|
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9785 because XListFonts (called in x_list_font) of some X server has |
|
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9786 a bug of not finding a font even if the font surely exists and |
|
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9787 is loadable by XLoadQueryFont. */ |
|
23162
b36799069143
(x_load_font): If SIZE is 0, don't use a name x_list_font returns.
Kenichi Handa <handa@m17n.org>
parents:
23151
diff
changeset
|
9788 if (size > 0 && !NILP (font_names)) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
9789 fontname = (char *) SDATA (XCAR (font_names)); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9790 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9791 BLOCK_INPUT; |
|
24484
d4ee4399e999
(x_list_fonts): Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24224
diff
changeset
|
9792 count = x_catch_errors (FRAME_X_DISPLAY (f)); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9793 font = (XFontStruct *) XLoadQueryFont (FRAME_X_DISPLAY (f), fontname); |
|
24484
d4ee4399e999
(x_list_fonts): Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24224
diff
changeset
|
9794 if (x_had_errors_p (FRAME_X_DISPLAY (f))) |
|
d4ee4399e999
(x_list_fonts): Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24224
diff
changeset
|
9795 { |
|
d4ee4399e999
(x_list_fonts): Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24224
diff
changeset
|
9796 /* This error is perhaps due to insufficient memory on X |
|
d4ee4399e999
(x_list_fonts): Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24224
diff
changeset
|
9797 server. Let's just ignore it. */ |
|
d4ee4399e999
(x_list_fonts): Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24224
diff
changeset
|
9798 font = NULL; |
|
d4ee4399e999
(x_list_fonts): Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24224
diff
changeset
|
9799 x_clear_errors (FRAME_X_DISPLAY (f)); |
|
d4ee4399e999
(x_list_fonts): Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24224
diff
changeset
|
9800 } |
|
d4ee4399e999
(x_list_fonts): Trap X errors so that Emacs doesn't die
Kenichi Handa <handa@m17n.org>
parents:
24224
diff
changeset
|
9801 x_uncatch_errors (FRAME_X_DISPLAY (f), count); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9802 UNBLOCK_INPUT; |
|
17194
ae76b2a59dcc
(dumpglyphs): Set a clipping region when we draw glyphs
Kenichi Handa <handa@m17n.org>
parents:
17178
diff
changeset
|
9803 if (!font) |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9804 return NULL; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9805 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9806 /* Find a free slot in the font table. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9807 for (i = 0; i < dpyinfo->n_fonts; ++i) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9808 if (dpyinfo->font_table[i].name == NULL) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9809 break; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9810 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9811 /* If no free slot found, maybe enlarge the font table. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9812 if (i == dpyinfo->n_fonts |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9813 && dpyinfo->n_fonts == dpyinfo->font_table_size) |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9814 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9815 int sz; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9816 dpyinfo->font_table_size = max (16, 2 * dpyinfo->font_table_size); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9817 sz = dpyinfo->font_table_size * sizeof *dpyinfo->font_table; |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9818 dpyinfo->font_table |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9819 = (struct font_info *) xrealloc (dpyinfo->font_table, sz); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9820 } |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9821 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9822 fontp = dpyinfo->font_table + i; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9823 if (i == dpyinfo->n_fonts) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9824 ++dpyinfo->n_fonts; |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9825 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9826 /* Now fill in the slots of *FONTP. */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9827 BLOCK_INPUT; |
|
52730
7535333d9c75
(x_load_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
52728
diff
changeset
|
9828 bzero (fontp, sizeof (*fontp)); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9829 fontp->font = font; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9830 fontp->font_idx = i; |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9831 fontp->name = (char *) xmalloc (strlen (fontname) + 1); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9832 bcopy (fontname, fontp->name, strlen (fontname) + 1); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9833 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9834 /* Try to get the full name of FONT. Put it in FULL_NAME. */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9835 full_name = 0; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9836 if (XGetFontProperty (font, XA_FONT, &value)) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9837 { |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9838 char *name = (char *) XGetAtomName (FRAME_X_DISPLAY (f), (Atom) value); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9839 char *p = name; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9840 int dashes = 0; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9841 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9842 /* Count the number of dashes in the "full name". |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9843 If it is too few, this isn't really the font's full name, |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9844 so don't use it. |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9845 In X11R4, the fonts did not come with their canonical names |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9846 stored in them. */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9847 while (*p) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9848 { |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9849 if (*p == '-') |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9850 dashes++; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9851 p++; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9852 } |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9853 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9854 if (dashes >= 13) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9855 { |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9856 full_name = (char *) xmalloc (p - name + 1); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9857 bcopy (name, full_name, p - name + 1); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9858 } |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9859 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9860 XFree (name); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9861 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
9862 |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9863 if (full_name != 0) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9864 fontp->full_name = full_name; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9865 else |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9866 fontp->full_name = fontp->name; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9867 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9868 fontp->size = font->max_bounds.width; |
|
24224
4001ff593a99
(x_load_font): For the height of font, if normarl ascent and
Kenichi Handa <handa@m17n.org>
parents:
24223
diff
changeset
|
9869 fontp->height = FONT_HEIGHT (font); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9870 |
|
18347
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9871 if (NILP (font_names)) |
|
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9872 { |
|
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9873 /* We come here because of a bug of XListFonts mentioned at |
|
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9874 the head of this block. Let's store this information in |
|
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9875 the cache for x_list_fonts. */ |
|
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9876 Lisp_Object lispy_name = build_string (fontname); |
|
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9877 Lisp_Object lispy_full_name = build_string (fontp->full_name); |
|
35367
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9878 Lisp_Object key = Fcons (Fcons (lispy_name, make_number (256)), |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9879 Qnil); |
|
18347
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9880 |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9881 XSETCDR (dpyinfo->name_list_element, |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9882 Fcons (Fcons (key, |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9883 Fcons (Fcons (lispy_full_name, |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9884 make_number (fontp->size)), |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9885 Qnil)), |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9886 XCDR (dpyinfo->name_list_element))); |
|
18347
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9887 if (full_name) |
|
35367
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9888 { |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9889 key = Fcons (Fcons (lispy_full_name, make_number (256)), |
|
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9890 Qnil); |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9891 XSETCDR (dpyinfo->name_list_element, |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9892 Fcons (Fcons (key, |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9893 Fcons (Fcons (lispy_full_name, |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9894 make_number (fontp->size)), |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9895 Qnil)), |
|
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
9896 XCDR (dpyinfo->name_list_element))); |
|
35367
68000d773920
(x_list_fonts): Allow scalable fonts if SIZE is < 0,
Gerd Moellmann <gerd@gnu.org>
parents:
35315
diff
changeset
|
9897 } |
|
18347
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9898 } |
|
b7024f44f5d2
(dumpglyphs): Use FS_LOAD_FONT.
Kenichi Handa <handa@m17n.org>
parents:
18191
diff
changeset
|
9899 |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9900 /* The slot `encoding' specifies how to map a character |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9901 code-points (0x20..0x7F or 0x2020..0x7F7F) of each charset to |
|
28231
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
9902 the font code-points (0:0x20..0x7F, 1:0xA0..0xFF), or |
|
076ed36c3101
Include fontset.h after dispextern.h.
Kenichi Handa <handa@m17n.org>
parents:
28183
diff
changeset
|
9903 (0:0x2020..0x7F7F, 1:0xA0A0..0xFFFF, 3:0x20A0..0x7FFF, |
|
18057
07e0112aa8f5
(x_load_font): Use macro FONT_ENCODING_NOT_DECIDED.
Richard M. Stallman <rms@gnu.org>
parents:
18008
diff
changeset
|
9904 2:0xA020..0xFF7F). For the moment, we don't know which charset |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9905 uses this font. So, we set information in fontp->encoding[1] |
|
18057
07e0112aa8f5
(x_load_font): Use macro FONT_ENCODING_NOT_DECIDED.
Richard M. Stallman <rms@gnu.org>
parents:
18008
diff
changeset
|
9906 which is never used by any charset. If mapping can't be |
|
07e0112aa8f5
(x_load_font): Use macro FONT_ENCODING_NOT_DECIDED.
Richard M. Stallman <rms@gnu.org>
parents:
18008
diff
changeset
|
9907 decided, set FONT_ENCODING_NOT_DECIDED. */ |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9908 fontp->encoding[1] |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9909 = (font->max_byte1 == 0 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9910 /* 1-byte font */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9911 ? (font->min_char_or_byte2 < 0x80 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9912 ? (font->max_char_or_byte2 < 0x80 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9913 ? 0 /* 0x20..0x7F */ |
|
18057
07e0112aa8f5
(x_load_font): Use macro FONT_ENCODING_NOT_DECIDED.
Richard M. Stallman <rms@gnu.org>
parents:
18008
diff
changeset
|
9914 : FONT_ENCODING_NOT_DECIDED) /* 0x20..0xFF */ |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9915 : 1) /* 0xA0..0xFF */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9916 /* 2-byte font */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9917 : (font->min_byte1 < 0x80 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9918 ? (font->max_byte1 < 0x80 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9919 ? (font->min_char_or_byte2 < 0x80 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9920 ? (font->max_char_or_byte2 < 0x80 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9921 ? 0 /* 0x2020..0x7F7F */ |
|
18057
07e0112aa8f5
(x_load_font): Use macro FONT_ENCODING_NOT_DECIDED.
Richard M. Stallman <rms@gnu.org>
parents:
18008
diff
changeset
|
9922 : FONT_ENCODING_NOT_DECIDED) /* 0x2020..0x7FFF */ |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9923 : 3) /* 0x20A0..0x7FFF */ |
|
18057
07e0112aa8f5
(x_load_font): Use macro FONT_ENCODING_NOT_DECIDED.
Richard M. Stallman <rms@gnu.org>
parents:
18008
diff
changeset
|
9924 : FONT_ENCODING_NOT_DECIDED) /* 0x20??..0xA0?? */ |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9925 : (font->min_char_or_byte2 < 0x80 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9926 ? (font->max_char_or_byte2 < 0x80 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9927 ? 2 /* 0xA020..0xFF7F */ |
|
18057
07e0112aa8f5
(x_load_font): Use macro FONT_ENCODING_NOT_DECIDED.
Richard M. Stallman <rms@gnu.org>
parents:
18008
diff
changeset
|
9928 : FONT_ENCODING_NOT_DECIDED) /* 0xA020..0xFFFF */ |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9929 : 1))); /* 0xA0A0..0xFFFF */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9930 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9931 fontp->baseline_offset |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9932 = (XGetFontProperty (font, dpyinfo->Xatom_MULE_BASELINE_OFFSET, &value) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9933 ? (long) value : 0); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9934 fontp->relative_compose |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9935 = (XGetFontProperty (font, dpyinfo->Xatom_MULE_RELATIVE_COMPOSE, &value) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9936 ? (long) value : 0); |
|
17103
7cde34a6424e
(dumpglyphs): Pay attention to characters registered in
Kenichi Handa <handa@m17n.org>
parents:
17050
diff
changeset
|
9937 fontp->default_ascent |
|
7cde34a6424e
(dumpglyphs): Pay attention to characters registered in
Kenichi Handa <handa@m17n.org>
parents:
17050
diff
changeset
|
9938 = (XGetFontProperty (font, dpyinfo->Xatom_MULE_DEFAULT_ASCENT, &value) |
|
7cde34a6424e
(dumpglyphs): Pay attention to characters registered in
Kenichi Handa <handa@m17n.org>
parents:
17050
diff
changeset
|
9939 ? (long) value : 0); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9940 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9941 /* Set global flag fonts_changed_p to non-zero if the font loaded |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9942 has a character with a smaller width than any other character |
|
42688
21f5612addbb
(x_load_font): Never set fonts_changed_p to zero.
Andreas Schwab <schwab@suse.de>
parents:
42675
diff
changeset
|
9943 before, or if the font loaded has a smaller height than any |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9944 other font loaded before. If this happens, it will make a |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9945 glyph matrix reallocation necessary. */ |
|
42688
21f5612addbb
(x_load_font): Never set fonts_changed_p to zero.
Andreas Schwab <schwab@suse.de>
parents:
42675
diff
changeset
|
9946 fonts_changed_p |= x_compute_min_glyph_bounds (f); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9947 UNBLOCK_INPUT; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9948 return fontp; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9949 } |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9950 } |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9951 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9952 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9953 /* Return a pointer to struct font_info of a font named FONTNAME for |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9954 frame F. If no such font is loaded, return NULL. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9955 |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9956 struct font_info * |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9957 x_query_font (f, fontname) |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9958 struct frame *f; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9959 register char *fontname; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9960 { |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9961 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9962 int i; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9963 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9964 for (i = 0; i < dpyinfo->n_fonts; i++) |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9965 if (dpyinfo->font_table[i].name |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9966 && (!strcmp (dpyinfo->font_table[i].name, fontname) |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9967 || !strcmp (dpyinfo->font_table[i].full_name, fontname))) |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9968 return (dpyinfo->font_table + i); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9969 return NULL; |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9970 } |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
9971 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9972 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
9973 /* Find a CCL program for a font specified by FONTP, and set the member |
|
21548
5d1f1ba38043
(x_find_ccl_program): New function.
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
9974 `encoder' of the structure. */ |
|
5d1f1ba38043
(x_find_ccl_program): New function.
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
9975 |
|
5d1f1ba38043
(x_find_ccl_program): New function.
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
9976 void |
|
5d1f1ba38043
(x_find_ccl_program): New function.
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
9977 x_find_ccl_program (fontp) |
|
5d1f1ba38043
(x_find_ccl_program): New function.
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
9978 struct font_info *fontp; |
|
5d1f1ba38043
(x_find_ccl_program): New function.
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
9979 { |
|
25068
0d081383b5b8
(x_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24991
diff
changeset
|
9980 Lisp_Object list, elt; |
|
21548
5d1f1ba38043
(x_find_ccl_program): New function.
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
9981 |
|
31694
97c48afc4c5a
(x_draw_image_glyph_string): Remove a comment describing
Gerd Moellmann <gerd@gnu.org>
parents:
31614
diff
changeset
|
9982 elt = Qnil; |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9983 for (list = Vfont_ccl_encoder_alist; CONSP (list); list = XCDR (list)) |
|
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9984 { |
|
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9985 elt = XCAR (list); |
|
21548
5d1f1ba38043
(x_find_ccl_program): New function.
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
9986 if (CONSP (elt) |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
9987 && STRINGP (XCAR (elt)) |
|
32640
9adbb2160f48
(x_find_ccl_program): Check also fontp->full_name.
Kenichi Handa <handa@m17n.org>
parents:
32607
diff
changeset
|
9988 && ((fast_c_string_match_ignore_case (XCAR (elt), fontp->name) |
|
9adbb2160f48
(x_find_ccl_program): Check also fontp->full_name.
Kenichi Handa <handa@m17n.org>
parents:
32607
diff
changeset
|
9989 >= 0) |
|
9adbb2160f48
(x_find_ccl_program): Check also fontp->full_name.
Kenichi Handa <handa@m17n.org>
parents:
32607
diff
changeset
|
9990 || (fast_c_string_match_ignore_case (XCAR (elt), fontp->full_name) |
|
9adbb2160f48
(x_find_ccl_program): Check also fontp->full_name.
Kenichi Handa <handa@m17n.org>
parents:
32607
diff
changeset
|
9991 >= 0))) |
|
25068
0d081383b5b8
(x_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24991
diff
changeset
|
9992 break; |
|
0d081383b5b8
(x_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24991
diff
changeset
|
9993 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
9994 |
|
25068
0d081383b5b8
(x_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24991
diff
changeset
|
9995 if (! NILP (list)) |
|
0d081383b5b8
(x_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24991
diff
changeset
|
9996 { |
|
25085
23813e3a69b8
(x_find_ccl_program): Add casting.
Kenichi Handa <handa@m17n.org>
parents:
25083
diff
changeset
|
9997 struct ccl_program *ccl |
|
23813e3a69b8
(x_find_ccl_program): Add casting.
Kenichi Handa <handa@m17n.org>
parents:
25083
diff
changeset
|
9998 = (struct ccl_program *) xmalloc (sizeof (struct ccl_program)); |
|
25068
0d081383b5b8
(x_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24991
diff
changeset
|
9999 |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
10000 if (setup_ccl_program (ccl, XCDR (elt)) < 0) |
|
25068
0d081383b5b8
(x_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24991
diff
changeset
|
10001 xfree (ccl); |
|
0d081383b5b8
(x_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24991
diff
changeset
|
10002 else |
|
0d081383b5b8
(x_find_ccl_program): Get compiled CCL code by just
Kenichi Handa <handa@m17n.org>
parents:
24991
diff
changeset
|
10003 fontp->font_encoder = ccl; |
|
21548
5d1f1ba38043
(x_find_ccl_program): New function.
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
10004 } |
|
5d1f1ba38043
(x_find_ccl_program): New function.
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
10005 } |
|
5d1f1ba38043
(x_find_ccl_program): New function.
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
10006 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10007 |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10008 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10009 /*********************************************************************** |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10010 Initialization |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10011 ***********************************************************************/ |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
10012 |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10013 #ifdef USE_X_TOOLKIT |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10014 static XrmOptionDescRec emacs_options[] = { |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10015 {"-geometry", ".geometry", XrmoptionSepArg, NULL}, |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10016 {"-iconic", ".iconic", XrmoptionNoArg, (XtPointer) "yes"}, |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10017 |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10018 {"-internal-border-width", "*EmacsScreen.internalBorderWidth", |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10019 XrmoptionSepArg, NULL}, |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10020 {"-ib", "*EmacsScreen.internalBorderWidth", XrmoptionSepArg, NULL}, |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10021 |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10022 {"-T", "*EmacsShell.title", XrmoptionSepArg, (XtPointer) NULL}, |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10023 {"-wn", "*EmacsShell.title", XrmoptionSepArg, (XtPointer) NULL}, |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10024 {"-title", "*EmacsShell.title", XrmoptionSepArg, (XtPointer) NULL}, |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10025 {"-iconname", "*EmacsShell.iconName", XrmoptionSepArg, (XtPointer) NULL}, |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10026 {"-in", "*EmacsShell.iconName", XrmoptionSepArg, (XtPointer) NULL}, |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10027 {"-mc", "*pointerColor", XrmoptionSepArg, (XtPointer) NULL}, |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10028 {"-cr", "*cursorColor", XrmoptionSepArg, (XtPointer) NULL} |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10029 }; |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10030 #endif /* USE_X_TOOLKIT */ |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10031 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10032 static int x_initialized; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10033 |
| 11015 | 10034 #ifdef MULTI_KBOARD |
| 10035 /* Test whether two display-name strings agree up to the dot that separates | |
| 10036 the screen number from the server number. */ | |
| 10037 static int | |
| 10038 same_x_server (name1, name2) | |
|
46479
4729f849c572
(same_x_server): String pointer args now point to
Ken Raeburn <raeburn@raeburn.org>
parents:
46435
diff
changeset
|
10039 const char *name1, *name2; |
| 11015 | 10040 { |
| 10041 int seen_colon = 0; | |
|
46479
4729f849c572
(same_x_server): String pointer args now point to
Ken Raeburn <raeburn@raeburn.org>
parents:
46435
diff
changeset
|
10042 const unsigned char *system_name = SDATA (Vsystem_name); |
|
24164
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10043 int system_name_length = strlen (system_name); |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10044 int length_until_period = 0; |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10045 |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10046 while (system_name[length_until_period] != 0 |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10047 && system_name[length_until_period] != '.') |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10048 length_until_period++; |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10049 |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10050 /* Treat `unix' like an empty host name. */ |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10051 if (! strncmp (name1, "unix:", 5)) |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10052 name1 += 4; |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10053 if (! strncmp (name2, "unix:", 5)) |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10054 name2 += 4; |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10055 /* Treat this host's name like an empty host name. */ |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10056 if (! strncmp (name1, system_name, system_name_length) |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10057 && name1[system_name_length] == ':') |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10058 name1 += system_name_length; |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10059 if (! strncmp (name2, system_name, system_name_length) |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10060 && name2[system_name_length] == ':') |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10061 name2 += system_name_length; |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10062 /* Treat this host's domainless name like an empty host name. */ |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10063 if (! strncmp (name1, system_name, length_until_period) |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10064 && name1[length_until_period] == ':') |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10065 name1 += length_until_period; |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10066 if (! strncmp (name2, system_name, length_until_period) |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10067 && name2[length_until_period] == ':') |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10068 name2 += length_until_period; |
|
1f8d4cb55bd6
(same_x_server): Detect treat ":0" and "unix:0"
Richard M. Stallman <rms@gnu.org>
parents:
23925
diff
changeset
|
10069 |
| 11015 | 10070 for (; *name1 != '\0' && *name1 == *name2; name1++, name2++) |
| 10071 { | |
| 10072 if (*name1 == ':') | |
| 10073 seen_colon++; | |
| 10074 if (seen_colon && *name1 == '.') | |
| 10075 return 1; | |
| 10076 } | |
| 10077 return (seen_colon | |
| 10078 && (*name1 == '.' || *name1 == '\0') | |
| 10079 && (*name2 == '.' || *name2 == '\0')); | |
| 10080 } | |
| 10081 #endif | |
| 10082 | |
|
52387
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10083 /* Count number of set bits in mask and number of bits to shift to |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10084 get to the first bit. With MASK 0x7e0, *BITS is set to 6, and *OFFSET |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10085 to 5. */ |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10086 static void |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10087 get_bits_and_offset (mask, bits, offset) |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10088 unsigned long mask; |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10089 int *bits; |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10090 int *offset; |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10091 { |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10092 int nr = 0; |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10093 int off = 0; |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10094 |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10095 while (!(mask & 1)) |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10096 { |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10097 off++; |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10098 mask >>= 1; |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10099 } |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10100 |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10101 while (mask & 1) |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10102 { |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10103 nr++; |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10104 mask >>= 1; |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10105 } |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10106 |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10107 *offset = off; |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10108 *bits = nr; |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10109 } |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10110 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10111 struct x_display_info * |
|
7801
10e818a0248a
(x_term_init): New args xrm_option and resource_string.
Richard M. Stallman <rms@gnu.org>
parents:
7738
diff
changeset
|
10112 x_term_init (display_name, xrm_option, resource_name) |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10113 Lisp_Object display_name; |
|
7801
10e818a0248a
(x_term_init): New args xrm_option and resource_string.
Richard M. Stallman <rms@gnu.org>
parents:
7738
diff
changeset
|
10114 char *xrm_option; |
|
10e818a0248a
(x_term_init): New args xrm_option and resource_string.
Richard M. Stallman <rms@gnu.org>
parents:
7738
diff
changeset
|
10115 char *resource_name; |
| 286 | 10116 { |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10117 int connection; |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10118 Display *dpy; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10119 struct x_display_info *dpyinfo; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10120 XrmDatabase xrdb; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10121 |
|
11997
50c7c05fc301
(x_term_init): Block input during this function.
Karl Heuer <kwzh@gnu.org>
parents:
11994
diff
changeset
|
10122 BLOCK_INPUT; |
|
50c7c05fc301
(x_term_init): Block input during this function.
Karl Heuer <kwzh@gnu.org>
parents:
11994
diff
changeset
|
10123 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10124 if (!x_initialized) |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10125 { |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10126 x_initialize (); |
|
52298
1a4bd2bec861
Create and initialize a client leader window so session management
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52258
diff
changeset
|
10127 ++x_initialized; |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10128 } |
| 286 | 10129 |
| 49322 | 10130 #ifdef USE_GTK |
| 10131 { | |
| 10132 #define NUM_ARGV 10 | |
| 10133 int argc; | |
| 10134 char *argv[NUM_ARGV]; | |
| 10135 char **argv2 = argv; | |
| 10136 GdkAtom atom; | |
| 10137 | |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10138 if (x_initialized++ > 1) |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10139 { |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10140 /* Opening another display. If xg_display_open returns less |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10141 than zero, we are probably on GTK 2.0, which can only handle |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10142 one display. GTK 2.2 or later can handle more than one. */ |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10143 if (xg_display_open (SDATA (display_name), &dpy) < 0) |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10144 error ("Sorry, this version of GTK can only handle one display"); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10145 } |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10146 else |
| 49322 | 10147 { |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10148 for (argc = 0; argc < NUM_ARGV; ++argc) |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10149 argv[argc] = 0; |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10150 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10151 argc = 0; |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10152 argv[argc++] = initial_argv[0]; |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10153 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10154 if (! NILP (display_name)) |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10155 { |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10156 argv[argc++] = "--display"; |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10157 argv[argc++] = SDATA (display_name); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10158 } |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10159 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10160 argv[argc++] = "--name"; |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10161 argv[argc++] = resource_name; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49434
diff
changeset
|
10162 |
|
49434
a4d0ee33dcce
Fix input methods for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
49326
diff
changeset
|
10163 #ifdef HAVE_X11R5 |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10164 XSetLocaleModifiers (""); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10165 #endif |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10166 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10167 gtk_init (&argc, &argv2); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10168 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10169 /* gtk_init does set_locale. We must fix locale after calling it. */ |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10170 fixup_locale (); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10171 xg_initialize (); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10172 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10173 dpy = GDK_DISPLAY (); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10174 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10175 /* NULL window -> events for all windows go to our function */ |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10176 gdk_window_add_filter (NULL, event_handler_gdk, NULL); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10177 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10178 /* Load our own gtkrc if it exists. */ |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10179 { |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10180 struct gcpro gcpro1, gcpro2; |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10181 char *file = "~/.emacs.d/gtkrc"; |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10182 Lisp_Object s, abs_file; |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10183 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10184 GCPRO2 (s, abs_file); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10185 s = make_string (file, strlen (file)); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10186 abs_file = Fexpand_file_name (s, Qnil); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10187 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10188 if (! NILP (abs_file) && !NILP (Ffile_readable_p (abs_file))) |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10189 gtk_rc_parse (SDATA (abs_file)); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10190 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10191 UNGCPRO; |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10192 } |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10193 |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10194 XSetErrorHandler (x_error_handler); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10195 XSetIOErrorHandler (x_io_error_quitter); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10196 } |
| 49322 | 10197 } |
| 10198 #else /* not USE_GTK */ | |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10199 #ifdef USE_X_TOOLKIT |
|
11436
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
10200 /* weiner@footloose.sps.mot.com reports that this causes |
|
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
10201 errors with X11R5: |
|
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
10202 X protocol error: BadAtom (invalid Atom parameter) |
|
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
10203 on protocol request 18skiloaf. |
|
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
10204 So let's not use it until R6. */ |
|
9829d3c035f2
(x_term_init): Call XtSetLanguageProc only if HAVE_X11XTR6.
Richard M. Stallman <rms@gnu.org>
parents:
11375
diff
changeset
|
10205 #ifdef HAVE_X11XTR6 |
|
9446
be58ba7c209d
(x_term_init): Call XtSetLanguageProc or XSetLocaleModifiers.
Richard M. Stallman <rms@gnu.org>
parents:
9340
diff
changeset
|
10206 XtSetLanguageProc (NULL, NULL, NULL); |
|
be58ba7c209d
(x_term_init): Call XtSetLanguageProc or XSetLocaleModifiers.
Richard M. Stallman <rms@gnu.org>
parents:
9340
diff
changeset
|
10207 #endif |
|
be58ba7c209d
(x_term_init): Call XtSetLanguageProc or XSetLocaleModifiers.
Richard M. Stallman <rms@gnu.org>
parents:
9340
diff
changeset
|
10208 |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10209 { |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10210 int argc = 0; |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10211 char *argv[3]; |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10212 |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10213 argv[0] = ""; |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10214 argc = 1; |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10215 if (xrm_option) |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10216 { |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10217 argv[argc++] = "-xrm"; |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10218 argv[argc++] = xrm_option; |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10219 } |
|
48169
d2c93bc1faf1
(x_term_init): Use turn_on_atimers, not start_polling and stop_polling.
Richard M. Stallman <rms@gnu.org>
parents:
48145
diff
changeset
|
10220 turn_on_atimers (0); |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10221 dpy = XtOpenDisplay (Xt_app_con, SDATA (display_name), |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10222 resource_name, EMACS_CLASS, |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10223 emacs_options, XtNumber (emacs_options), |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10224 &argc, argv); |
|
48169
d2c93bc1faf1
(x_term_init): Use turn_on_atimers, not start_polling and stop_polling.
Richard M. Stallman <rms@gnu.org>
parents:
48145
diff
changeset
|
10225 turn_on_atimers (1); |
|
12530
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
10226 |
|
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
10227 #ifdef HAVE_X11XTR6 |
|
14963
6ac4f300f9b4
Include locale.h if HAVE_SETLOCALE.
Richard M. Stallman <rms@gnu.org>
parents:
14946
diff
changeset
|
10228 /* I think this is to compensate for XtSetLanguageProc. */ |
|
23115
b992f7bb67d7
(fixup_locale): New function. For now, it resets
Paul Eggert <eggert@twinsun.com>
parents:
23107
diff
changeset
|
10229 fixup_locale (); |
|
12530
c2b2449231c2
[HAVE_X11XTR6]: Include locale.h
Karl Heuer <kwzh@gnu.org>
parents:
12494
diff
changeset
|
10230 #endif |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10231 } |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10232 |
|
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10233 #else /* not USE_X_TOOLKIT */ |
|
9446
be58ba7c209d
(x_term_init): Call XtSetLanguageProc or XSetLocaleModifiers.
Richard M. Stallman <rms@gnu.org>
parents:
9340
diff
changeset
|
10234 #ifdef HAVE_X11R5 |
|
be58ba7c209d
(x_term_init): Call XtSetLanguageProc or XSetLocaleModifiers.
Richard M. Stallman <rms@gnu.org>
parents:
9340
diff
changeset
|
10235 XSetLocaleModifiers (""); |
|
be58ba7c209d
(x_term_init): Call XtSetLanguageProc or XSetLocaleModifiers.
Richard M. Stallman <rms@gnu.org>
parents:
9340
diff
changeset
|
10236 #endif |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10237 dpy = XOpenDisplay (SDATA (display_name)); |
|
5672
cbc4229c1f90
(x_wm_set_size_hint): Swap southeast and northwest.
Richard M. Stallman <rms@gnu.org>
parents:
5362
diff
changeset
|
10238 #endif /* not USE_X_TOOLKIT */ |
| 49322 | 10239 #endif /* not USE_GTK*/ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10240 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10241 /* Detect failure. */ |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10242 if (dpy == 0) |
|
11997
50c7c05fc301
(x_term_init): Block input during this function.
Karl Heuer <kwzh@gnu.org>
parents:
11994
diff
changeset
|
10243 { |
|
50c7c05fc301
(x_term_init): Block input during this function.
Karl Heuer <kwzh@gnu.org>
parents:
11994
diff
changeset
|
10244 UNBLOCK_INPUT; |
|
50c7c05fc301
(x_term_init): Block input during this function.
Karl Heuer <kwzh@gnu.org>
parents:
11994
diff
changeset
|
10245 return 0; |
|
50c7c05fc301
(x_term_init): Block input during this function.
Karl Heuer <kwzh@gnu.org>
parents:
11994
diff
changeset
|
10246 } |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10247 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10248 /* We have definitely succeeded. Record the new connection. */ |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10249 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10250 dpyinfo = (struct x_display_info *) xmalloc (sizeof (struct x_display_info)); |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
10251 bzero (dpyinfo, sizeof *dpyinfo); |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10252 |
| 11015 | 10253 #ifdef MULTI_KBOARD |
| 10254 { | |
| 10255 struct x_display_info *share; | |
| 10256 Lisp_Object tail; | |
| 10257 | |
| 10258 for (share = x_display_list, tail = x_display_name_list; share; | |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
10259 share = share->next, tail = XCDR (tail)) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10260 if (same_x_server (SDATA (XCAR (XCAR (tail))), |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10261 SDATA (display_name))) |
| 11015 | 10262 break; |
| 10263 if (share) | |
| 10264 dpyinfo->kboard = share->kboard; | |
| 10265 else | |
| 10266 { | |
| 10267 dpyinfo->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); | |
| 10268 init_kboard (dpyinfo->kboard); | |
|
11807
73fb6570f718
(Qvendor_specific_keysyms): New var.
Karl Heuer <kwzh@gnu.org>
parents:
11610
diff
changeset
|
10269 if (!EQ (XSYMBOL (Qvendor_specific_keysyms)->function, Qunbound)) |
|
73fb6570f718
(Qvendor_specific_keysyms): New var.
Karl Heuer <kwzh@gnu.org>
parents:
11610
diff
changeset
|
10270 { |
|
73fb6570f718
(Qvendor_specific_keysyms): New var.
Karl Heuer <kwzh@gnu.org>
parents:
11610
diff
changeset
|
10271 char *vendor = ServerVendor (dpy); |
|
28307
1d4a11a5f39d
(x_term_init): Unblock input around call1.
Gerd Moellmann <gerd@gnu.org>
parents:
28281
diff
changeset
|
10272 UNBLOCK_INPUT; |
|
11807
73fb6570f718
(Qvendor_specific_keysyms): New var.
Karl Heuer <kwzh@gnu.org>
parents:
11610
diff
changeset
|
10273 dpyinfo->kboard->Vsystem_key_alist |
|
73fb6570f718
(Qvendor_specific_keysyms): New var.
Karl Heuer <kwzh@gnu.org>
parents:
11610
diff
changeset
|
10274 = call1 (Qvendor_specific_keysyms, |
|
73fb6570f718
(Qvendor_specific_keysyms): New var.
Karl Heuer <kwzh@gnu.org>
parents:
11610
diff
changeset
|
10275 build_string (vendor ? vendor : "")); |
|
28307
1d4a11a5f39d
(x_term_init): Unblock input around call1.
Gerd Moellmann <gerd@gnu.org>
parents:
28281
diff
changeset
|
10276 BLOCK_INPUT; |
|
11807
73fb6570f718
(Qvendor_specific_keysyms): New var.
Karl Heuer <kwzh@gnu.org>
parents:
11610
diff
changeset
|
10277 } |
|
73fb6570f718
(Qvendor_specific_keysyms): New var.
Karl Heuer <kwzh@gnu.org>
parents:
11610
diff
changeset
|
10278 |
| 11015 | 10279 dpyinfo->kboard->next_kboard = all_kboards; |
| 10280 all_kboards = dpyinfo->kboard; | |
|
11544
cc965273a769
(x_term_init): If the previous kboard was the dummy one,
Karl Heuer <kwzh@gnu.org>
parents:
11536
diff
changeset
|
10281 /* Don't let the initial kboard remain current longer than necessary. |
|
cc965273a769
(x_term_init): If the previous kboard was the dummy one,
Karl Heuer <kwzh@gnu.org>
parents:
11536
diff
changeset
|
10282 That would cause problems if a file loaded on startup tries to |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10283 prompt in the mini-buffer. */ |
|
11544
cc965273a769
(x_term_init): If the previous kboard was the dummy one,
Karl Heuer <kwzh@gnu.org>
parents:
11536
diff
changeset
|
10284 if (current_kboard == initial_kboard) |
|
cc965273a769
(x_term_init): If the previous kboard was the dummy one,
Karl Heuer <kwzh@gnu.org>
parents:
11536
diff
changeset
|
10285 current_kboard = dpyinfo->kboard; |
| 11015 | 10286 } |
| 10287 dpyinfo->kboard->reference_count++; | |
| 10288 } | |
|
10652
f6a41cb94a75
[MULTI_PERDISPLAY] (x_term_init): Initialize perdisplay.
Karl Heuer <kwzh@gnu.org>
parents:
10634
diff
changeset
|
10289 #endif |
|
f6a41cb94a75
[MULTI_PERDISPLAY] (x_term_init): Initialize perdisplay.
Karl Heuer <kwzh@gnu.org>
parents:
10634
diff
changeset
|
10290 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10291 /* Put this display on the chain. */ |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10292 dpyinfo->next = x_display_list; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10293 x_display_list = dpyinfo; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10294 |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10295 /* Put it on x_display_name_list as well, to keep them parallel. */ |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10296 x_display_name_list = Fcons (Fcons (display_name, Qnil), |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10297 x_display_name_list); |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
10298 dpyinfo->name_list_element = XCAR (x_display_name_list); |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10299 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10300 dpyinfo->display = dpy; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10301 |
| 286 | 10302 #if 0 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10303 XSetAfterFunction (x_current_display, x_trace_wire); |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
10304 #endif /* ! 0 */ |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10305 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10306 dpyinfo->x_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
|
10307 = (char *) xmalloc (SBYTES (Vinvocation_name) |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10308 + SBYTES (Vsystem_name) |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10309 + 2); |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10310 sprintf (dpyinfo->x_id_name, "%s@%s", |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10311 SDATA (Vinvocation_name), SDATA (Vsystem_name)); |
|
1279
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
10312 |
|
74ae34a80f94
* xterm.c (x_meta_mod_mask): New variable, indicating which X
Jim Blandy <jimb@redhat.com>
parents:
1127
diff
changeset
|
10313 /* Figure out which modifier bits mean what. */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10314 x_find_modifier_meanings (dpyinfo); |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
10315 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
10316 /* Get the scroll bar cursor. */ |
|
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10317 #ifdef USE_GTK |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10318 /* We must create a GTK cursor, it is required for GTK widgets. */ |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10319 dpyinfo->xg_cursor = xg_create_default_cursor (dpyinfo->display); |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10320 #endif /* USE_GTK */ |
|
1218a42792ea
Implement multiple display handling for GTK.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
53061
diff
changeset
|
10321 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10322 dpyinfo->vertical_scroll_bar_cursor |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10323 = XCreateFontCursor (dpyinfo->display, XC_sb_v_double_arrow); |
|
2195
b20bb441f47f
(Xatom_wm_change_state): Define here.
Richard M. Stallman <rms@gnu.org>
parents:
2127
diff
changeset
|
10324 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10325 xrdb = x_load_resources (dpyinfo->display, xrm_option, |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10326 resource_name, EMACS_CLASS); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10327 #ifdef HAVE_XRMSETDATABASE |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10328 XrmSetDatabase (dpyinfo->display, xrdb); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10329 #else |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10330 dpyinfo->display->db = xrdb; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10331 #endif |
|
11162
95b70c82ec51
(x_term_init): Initialize cut_buffers_initialized.
Karl Heuer <kwzh@gnu.org>
parents:
11122
diff
changeset
|
10332 /* Put the rdb where we can find it in a way that works on |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10333 all versions. */ |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10334 dpyinfo->xrdb = xrdb; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10335 |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10336 dpyinfo->screen = ScreenOfDisplay (dpyinfo->display, |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10337 DefaultScreen (dpyinfo->display)); |
|
27991
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10338 select_visual (dpyinfo); |
|
27985
4ba445af210b
(x_term_init): Set Colormap member of x_display_info
Gerd Moellmann <gerd@gnu.org>
parents:
27974
diff
changeset
|
10339 dpyinfo->cmap = DefaultColormapOfScreen (dpyinfo->screen); |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10340 dpyinfo->height = HeightOfScreen (dpyinfo->screen); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10341 dpyinfo->width = WidthOfScreen (dpyinfo->screen); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10342 dpyinfo->root_window = RootWindowOfScreen (dpyinfo->screen); |
|
52298
1a4bd2bec861
Create and initialize a client leader window so session management
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52258
diff
changeset
|
10343 dpyinfo->client_leader_window = 0; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10344 dpyinfo->grabbed = 0; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10345 dpyinfo->reference_count = 0; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10346 dpyinfo->icon_bitmap_id = -1; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10347 dpyinfo->font_table = NULL; |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10348 dpyinfo->n_fonts = 0; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10349 dpyinfo->font_table_size = 0; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10350 dpyinfo->bitmaps = 0; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10351 dpyinfo->bitmaps_size = 0; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10352 dpyinfo->bitmaps_last = 0; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10353 dpyinfo->scratch_cursor_gc = 0; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10354 dpyinfo->mouse_face_mouse_frame = 0; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10355 dpyinfo->mouse_face_deferred_gc = 0; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10356 dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10357 dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10358 dpyinfo->mouse_face_face_id = DEFAULT_FACE_ID; |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10359 dpyinfo->mouse_face_window = Qnil; |
|
36587
d9bb01d5dbbb
(note_mouse_highlight): Call mouse_face_overlay_overlaps
Gerd Moellmann <gerd@gnu.org>
parents:
36555
diff
changeset
|
10360 dpyinfo->mouse_face_overlay = Qnil; |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10361 dpyinfo->mouse_face_mouse_x = dpyinfo->mouse_face_mouse_y = 0; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10362 dpyinfo->mouse_face_defer = 0; |
|
43369
493438ba5e2c
(disable_mouse_highlight): Removed variable.
Kim F. Storm <storm@cua.dk>
parents:
43343
diff
changeset
|
10363 dpyinfo->mouse_face_hidden = 0; |
|
11536
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
10364 dpyinfo->x_focus_frame = 0; |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
10365 dpyinfo->x_focus_event_frame = 0; |
|
c4d3218acd7e
(x_focus_frame, x_focus_event_frame, x_highlight_frame):
Karl Heuer <kwzh@gnu.org>
parents:
11436
diff
changeset
|
10366 dpyinfo->x_highlight_frame = 0; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10367 dpyinfo->image_cache = make_image_cache (); |
|
52752
751a01f97570
Make (modify-frame-parameters nil '((top . 0))) work for all types
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52730
diff
changeset
|
10368 dpyinfo->wm_type = X_WMTYPE_UNKNOWN; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10369 |
|
52387
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10370 /* See if we can construct pixel values from RGB values. */ |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10371 dpyinfo->red_bits = dpyinfo->blue_bits = dpyinfo->green_bits = 0; |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10372 dpyinfo->red_offset = dpyinfo->blue_offset = dpyinfo->green_offset = 0; |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10373 |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10374 if (dpyinfo->visual->class == TrueColor) |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10375 { |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10376 get_bits_and_offset (dpyinfo->visual->red_mask, |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10377 &dpyinfo->red_bits, &dpyinfo->red_offset); |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10378 get_bits_and_offset (dpyinfo->visual->blue_mask, |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10379 &dpyinfo->blue_bits, &dpyinfo->blue_offset); |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10380 get_bits_and_offset (dpyinfo->visual->green_mask, |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10381 &dpyinfo->green_bits, &dpyinfo->green_offset); |
|
2415f47f227a
Fix pixel calculation for TrueVisuals.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52298
diff
changeset
|
10382 } |
|
54650
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
10383 |
|
27985
4ba445af210b
(x_term_init): Set Colormap member of x_display_info
Gerd Moellmann <gerd@gnu.org>
parents:
27974
diff
changeset
|
10384 /* See if a private colormap is requested. */ |
|
27991
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10385 if (dpyinfo->visual == DefaultVisualOfScreen (dpyinfo->screen)) |
|
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10386 { |
|
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10387 if (dpyinfo->visual->class == PseudoColor) |
|
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10388 { |
|
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10389 Lisp_Object value; |
|
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10390 value = display_x_get_resource (dpyinfo, |
|
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10391 build_string ("privateColormap"), |
|
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10392 build_string ("PrivateColormap"), |
|
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10393 Qnil, Qnil); |
|
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10394 if (STRINGP (value) |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10395 && (!strcmp (SDATA (value), "true") |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10396 || !strcmp (SDATA (value), "on"))) |
|
27991
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10397 dpyinfo->cmap = XCopyColormapAndFree (dpyinfo->display, dpyinfo->cmap); |
|
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10398 } |
|
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10399 } |
|
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10400 else |
|
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10401 dpyinfo->cmap = XCreateColormap (dpyinfo->display, dpyinfo->root_window, |
|
cf10555b8ce0
(x_term_init): Create a colormap if not using the
Gerd Moellmann <gerd@gnu.org>
parents:
27985
diff
changeset
|
10402 dpyinfo->visual, AllocNone); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10403 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10404 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10405 int screen_number = XScreenNumberOfScreen (dpyinfo->screen); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10406 double pixels = DisplayHeight (dpyinfo->display, screen_number); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10407 double mm = DisplayHeightMM (dpyinfo->display, screen_number); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10408 dpyinfo->resy = pixels * 25.4 / mm; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10409 pixels = DisplayWidth (dpyinfo->display, screen_number); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10410 mm = DisplayWidthMM (dpyinfo->display, screen_number); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10411 dpyinfo->resx = pixels * 25.4 / mm; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10412 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10413 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10414 dpyinfo->Xatom_wm_protocols |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10415 = XInternAtom (dpyinfo->display, "WM_PROTOCOLS", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10416 dpyinfo->Xatom_wm_take_focus |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10417 = XInternAtom (dpyinfo->display, "WM_TAKE_FOCUS", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10418 dpyinfo->Xatom_wm_save_yourself |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10419 = XInternAtom (dpyinfo->display, "WM_SAVE_YOURSELF", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10420 dpyinfo->Xatom_wm_delete_window |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10421 = XInternAtom (dpyinfo->display, "WM_DELETE_WINDOW", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10422 dpyinfo->Xatom_wm_change_state |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10423 = XInternAtom (dpyinfo->display, "WM_CHANGE_STATE", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10424 dpyinfo->Xatom_wm_configure_denied |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10425 = XInternAtom (dpyinfo->display, "WM_CONFIGURE_DENIED", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10426 dpyinfo->Xatom_wm_window_moved |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10427 = XInternAtom (dpyinfo->display, "WM_MOVED", False); |
|
52298
1a4bd2bec861
Create and initialize a client leader window so session management
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52258
diff
changeset
|
10428 dpyinfo->Xatom_wm_client_leader |
|
1a4bd2bec861
Create and initialize a client leader window so session management
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52258
diff
changeset
|
10429 = XInternAtom (dpyinfo->display, "WM_CLIENT_LEADER", False); |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10430 dpyinfo->Xatom_editres |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10431 = XInternAtom (dpyinfo->display, "Editres", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10432 dpyinfo->Xatom_CLIPBOARD |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10433 = XInternAtom (dpyinfo->display, "CLIPBOARD", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10434 dpyinfo->Xatom_TIMESTAMP |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10435 = XInternAtom (dpyinfo->display, "TIMESTAMP", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10436 dpyinfo->Xatom_TEXT |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10437 = XInternAtom (dpyinfo->display, "TEXT", False); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10438 dpyinfo->Xatom_COMPOUND_TEXT |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10439 = XInternAtom (dpyinfo->display, "COMPOUND_TEXT", False); |
|
46882
9c2b3f9ec15a
(x_term_init): Initialize dpyinfo->Xatom_UTF8_STRING.
Kenichi Handa <handa@m17n.org>
parents:
46814
diff
changeset
|
10440 dpyinfo->Xatom_UTF8_STRING |
|
9c2b3f9ec15a
(x_term_init): Initialize dpyinfo->Xatom_UTF8_STRING.
Kenichi Handa <handa@m17n.org>
parents:
46814
diff
changeset
|
10441 = XInternAtom (dpyinfo->display, "UTF8_STRING", False); |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10442 dpyinfo->Xatom_DELETE |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10443 = XInternAtom (dpyinfo->display, "DELETE", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10444 dpyinfo->Xatom_MULTIPLE |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10445 = XInternAtom (dpyinfo->display, "MULTIPLE", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10446 dpyinfo->Xatom_INCR |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10447 = XInternAtom (dpyinfo->display, "INCR", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10448 dpyinfo->Xatom_EMACS_TMP |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10449 = XInternAtom (dpyinfo->display, "_EMACS_TMP_", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10450 dpyinfo->Xatom_TARGETS |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10451 = XInternAtom (dpyinfo->display, "TARGETS", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10452 dpyinfo->Xatom_NULL |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10453 = XInternAtom (dpyinfo->display, "NULL", False); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10454 dpyinfo->Xatom_ATOM_PAIR |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10455 = XInternAtom (dpyinfo->display, "ATOM_PAIR", False); |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10456 /* For properties of font. */ |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10457 dpyinfo->Xatom_PIXEL_SIZE |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10458 = XInternAtom (dpyinfo->display, "PIXEL_SIZE", False); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10459 dpyinfo->Xatom_MULE_BASELINE_OFFSET |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10460 = XInternAtom (dpyinfo->display, "_MULE_BASELINE_OFFSET", False); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10461 dpyinfo->Xatom_MULE_RELATIVE_COMPOSE |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10462 = XInternAtom (dpyinfo->display, "_MULE_RELATIVE_COMPOSE", False); |
|
17103
7cde34a6424e
(dumpglyphs): Pay attention to characters registered in
Kenichi Handa <handa@m17n.org>
parents:
17050
diff
changeset
|
10463 dpyinfo->Xatom_MULE_DEFAULT_ASCENT |
|
7cde34a6424e
(dumpglyphs): Pay attention to characters registered in
Kenichi Handa <handa@m17n.org>
parents:
17050
diff
changeset
|
10464 = XInternAtom (dpyinfo->display, "_MULE_DEFAULT_ASCENT", False); |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10465 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10466 /* Ghostscript support. */ |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10467 dpyinfo->Xatom_PAGE = XInternAtom (dpyinfo->display, "PAGE", False); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10468 dpyinfo->Xatom_DONE = XInternAtom (dpyinfo->display, "DONE", False); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10469 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10470 dpyinfo->Xatom_Scrollbar = XInternAtom (dpyinfo->display, "SCROLLBAR", |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10471 False); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10472 |
|
11162
95b70c82ec51
(x_term_init): Initialize cut_buffers_initialized.
Karl Heuer <kwzh@gnu.org>
parents:
11122
diff
changeset
|
10473 dpyinfo->cut_buffers_initialized = 0; |
|
95b70c82ec51
(x_term_init): Initialize cut_buffers_initialized.
Karl Heuer <kwzh@gnu.org>
parents:
11122
diff
changeset
|
10474 |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10475 connection = ConnectionNumber (dpyinfo->display); |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10476 dpyinfo->connection = connection; |
|
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10477 |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10478 { |
|
18705
c4f2eab8e736
(x_term_init): Don't use initializer for null_bits.
Richard M. Stallman <rms@gnu.org>
parents:
18646
diff
changeset
|
10479 char null_bits[1]; |
|
c4f2eab8e736
(x_term_init): Don't use initializer for null_bits.
Richard M. Stallman <rms@gnu.org>
parents:
18646
diff
changeset
|
10480 |
|
c4f2eab8e736
(x_term_init): Don't use initializer for null_bits.
Richard M. Stallman <rms@gnu.org>
parents:
18646
diff
changeset
|
10481 null_bits[0] = 0x00; |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10482 |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10483 dpyinfo->null_pixel |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10484 = XCreatePixmapFromBitmapData (dpyinfo->display, dpyinfo->root_window, |
|
17050
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10485 null_bits, 1, 1, (long) 0, (long) 0, |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10486 1); |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10487 } |
|
1e5fa2dc98cf
Include charset.h, ccl.h, and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents:
16898
diff
changeset
|
10488 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10489 { |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10490 extern int gray_bitmap_width, gray_bitmap_height; |
|
34511
1f69c833e2af
(x_term_init): Declare gray_bitmap_bits as `extern
Gerd Moellmann <gerd@gnu.org>
parents:
34449
diff
changeset
|
10491 extern char *gray_bitmap_bits; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10492 dpyinfo->gray |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10493 = XCreatePixmapFromBitmapData (dpyinfo->display, dpyinfo->root_window, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10494 gray_bitmap_bits, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10495 gray_bitmap_width, gray_bitmap_height, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10496 (unsigned long) 1, (unsigned long) 0, 1); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10497 } |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10498 |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
10499 #ifdef HAVE_X_I18N |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
10500 xim_initialize (dpyinfo, resource_name); |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
10501 #endif |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10502 |
| 9572 | 10503 #ifdef subprocesses |
| 10504 /* This is only needed for distinguishing keyboard and process input. */ | |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10505 if (connection != 0) |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10506 add_keyboard_wait_descriptor (connection); |
| 9572 | 10507 #endif |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
10508 |
|
4147
c6657758fb6f
* xterm.c (x_term_init): Adjust message printed when we can't
Jim Blandy <jimb@redhat.com>
parents:
3951
diff
changeset
|
10509 #ifndef F_SETOWN_BUG |
| 286 | 10510 #ifdef F_SETOWN |
| 10511 #ifdef F_SETOWN_SOCK_NEG | |
|
4683
6a5197116086
(x_term_init): Call change_keyboard_wait_descriptor,
Richard M. Stallman <rms@gnu.org>
parents:
4630
diff
changeset
|
10512 /* stdin is a socket here */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10513 fcntl (connection, F_SETOWN, -getpid ()); |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
10514 #else /* ! defined (F_SETOWN_SOCK_NEG) */ |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10515 fcntl (connection, F_SETOWN, getpid ()); |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
10516 #endif /* ! defined (F_SETOWN_SOCK_NEG) */ |
|
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
10517 #endif /* ! defined (F_SETOWN) */ |
|
4147
c6657758fb6f
* xterm.c (x_term_init): Adjust message printed when we can't
Jim Blandy <jimb@redhat.com>
parents:
3951
diff
changeset
|
10518 #endif /* F_SETOWN_BUG */ |
| 286 | 10519 |
| 10520 #ifdef SIGIO | |
|
11994
b4dd8ca308dd
(x_term_init): Call init_sigio only if interrupt_input.
Karl Heuer <kwzh@gnu.org>
parents:
11988
diff
changeset
|
10521 if (interrupt_input) |
|
b4dd8ca308dd
(x_term_init): Call init_sigio only if interrupt_input.
Karl Heuer <kwzh@gnu.org>
parents:
11988
diff
changeset
|
10522 init_sigio (connection); |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
10523 #endif /* ! defined (SIGIO) */ |
| 286 | 10524 |
|
15904
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10525 #ifdef USE_LUCID |
|
19021
6f150e46a5fd
(x_term_init) [! HAVE_X11R5]: Don't try to use XtCvtStringToFont.
Richard M. Stallman <rms@gnu.org>
parents:
18996
diff
changeset
|
10526 #ifdef HAVE_X11R5 /* It seems X11R4 lacks XtCvtStringToFont, and XPointer. */ |
|
15904
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10527 /* Make sure that we have a valid font for dialog boxes |
|
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10528 so that Xt does not crash. */ |
|
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10529 { |
|
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10530 Display *dpy = dpyinfo->display; |
|
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10531 XrmValue d, fr, to; |
|
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10532 Font font; |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
10533 int count; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10534 |
|
15904
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10535 d.addr = (XPointer)&dpy; |
|
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10536 d.size = sizeof (Display *); |
|
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10537 fr.addr = XtDefaultFont; |
|
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10538 fr.size = sizeof (XtDefaultFont); |
|
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10539 to.size = sizeof (Font *); |
|
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10540 to.addr = (XPointer)&font; |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
10541 count = x_catch_errors (dpy); |
|
15904
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10542 if (!XtCallConverter (dpy, XtCvtStringToFont, &d, 1, &fr, &to, NULL)) |
|
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10543 abort (); |
|
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10544 if (x_had_errors_p (dpy) || !XQueryFont (dpy, font)) |
|
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10545 XrmPutLineResource (&xrdb, "Emacs.dialog.*.font: 9x15"); |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
10546 x_uncatch_errors (dpy, count); |
|
15904
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10547 } |
|
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10548 #endif |
|
19021
6f150e46a5fd
(x_term_init) [! HAVE_X11R5]: Don't try to use XtCvtStringToFont.
Richard M. Stallman <rms@gnu.org>
parents:
18996
diff
changeset
|
10549 #endif |
|
15904
a31cfab57f69
(x_term_init): If the default Xt font does not exist on
Richard M. Stallman <rms@gnu.org>
parents:
15808
diff
changeset
|
10550 |
| 28139 | 10551 /* See if we should run in synchronous mode. This is useful |
| 10552 for debugging X code. */ | |
| 10553 { | |
| 10554 Lisp_Object value; | |
| 10555 value = display_x_get_resource (dpyinfo, | |
| 10556 build_string ("synchronous"), | |
| 10557 build_string ("Synchronous"), | |
| 10558 Qnil, Qnil); | |
| 10559 if (STRINGP (value) | |
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10560 && (!strcmp (SDATA (value), "true") |
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
10561 || !strcmp (SDATA (value), "on"))) |
| 28139 | 10562 XSynchronize (dpyinfo->display, True); |
| 10563 } | |
|
51897
535ddb6daa07
(x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask, and use the Gtk+
Juanma Barranquero <lekktu@gmail.com>
parents:
51825
diff
changeset
|
10564 |
| 51129 | 10565 { |
| 10566 Lisp_Object value; | |
| 10567 value = display_x_get_resource (dpyinfo, | |
| 10568 build_string ("useXIM"), | |
| 10569 build_string ("UseXIM"), | |
| 10570 Qnil, Qnil); | |
|
51825
7003a80a49ec
(x_term_init) [!USE_XIM]: Use `useXIM' resource to turn on XIM.
Kim F. Storm <storm@cua.dk>
parents:
51823
diff
changeset
|
10571 #ifdef USE_XIM |
| 51129 | 10572 if (STRINGP (value) |
| 10573 && (!strcmp (XSTRING (value)->data, "false") | |
| 10574 || !strcmp (XSTRING (value)->data, "off"))) | |
| 10575 use_xim = 0; | |
|
51825
7003a80a49ec
(x_term_init) [!USE_XIM]: Use `useXIM' resource to turn on XIM.
Kim F. Storm <storm@cua.dk>
parents:
51823
diff
changeset
|
10576 #else |
|
7003a80a49ec
(x_term_init) [!USE_XIM]: Use `useXIM' resource to turn on XIM.
Kim F. Storm <storm@cua.dk>
parents:
51823
diff
changeset
|
10577 if (STRINGP (value) |
|
7003a80a49ec
(x_term_init) [!USE_XIM]: Use `useXIM' resource to turn on XIM.
Kim F. Storm <storm@cua.dk>
parents:
51823
diff
changeset
|
10578 && (!strcmp (XSTRING (value)->data, "true") |
|
7003a80a49ec
(x_term_init) [!USE_XIM]: Use `useXIM' resource to turn on XIM.
Kim F. Storm <storm@cua.dk>
parents:
51823
diff
changeset
|
10579 || !strcmp (XSTRING (value)->data, "on"))) |
|
7003a80a49ec
(x_term_init) [!USE_XIM]: Use `useXIM' resource to turn on XIM.
Kim F. Storm <storm@cua.dk>
parents:
51823
diff
changeset
|
10580 use_xim = 1; |
|
7003a80a49ec
(x_term_init) [!USE_XIM]: Use `useXIM' resource to turn on XIM.
Kim F. Storm <storm@cua.dk>
parents:
51823
diff
changeset
|
10581 #endif |
| 51129 | 10582 } |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10583 |
|
52298
1a4bd2bec861
Create and initialize a client leader window so session management
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52258
diff
changeset
|
10584 #ifdef HAVE_X_SM |
|
1a4bd2bec861
Create and initialize a client leader window so session management
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52258
diff
changeset
|
10585 /* Only do this for the first display. */ |
|
1a4bd2bec861
Create and initialize a client leader window so session management
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52258
diff
changeset
|
10586 if (x_initialized == 1) |
|
1a4bd2bec861
Create and initialize a client leader window so session management
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52258
diff
changeset
|
10587 x_session_initialize (dpyinfo); |
|
1a4bd2bec861
Create and initialize a client leader window so session management
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52258
diff
changeset
|
10588 #endif |
|
1a4bd2bec861
Create and initialize a client leader window so session management
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52258
diff
changeset
|
10589 |
|
11997
50c7c05fc301
(x_term_init): Block input during this function.
Karl Heuer <kwzh@gnu.org>
parents:
11994
diff
changeset
|
10590 UNBLOCK_INPUT; |
|
50c7c05fc301
(x_term_init): Block input during this function.
Karl Heuer <kwzh@gnu.org>
parents:
11994
diff
changeset
|
10591 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10592 return dpyinfo; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10593 } |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10594 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10595 /* Get rid of display DPYINFO, assuming all frames are already gone, |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10596 and without sending any more commands to the X server. */ |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10597 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10598 void |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10599 x_delete_display (dpyinfo) |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10600 struct x_display_info *dpyinfo; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10601 { |
|
52753
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
10602 int i; |
|
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
10603 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10604 delete_keyboard_wait_descriptor (dpyinfo->connection); |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10605 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10606 /* Discard this display from x_display_name_list and x_display_list. |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10607 We can't use Fdelq because that can quit. */ |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10608 if (! NILP (x_display_name_list) |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
10609 && EQ (XCAR (x_display_name_list), dpyinfo->name_list_element)) |
|
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
10610 x_display_name_list = XCDR (x_display_name_list); |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10611 else |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10612 { |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10613 Lisp_Object tail; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10614 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10615 tail = x_display_name_list; |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
10616 while (CONSP (tail) && CONSP (XCDR (tail))) |
|
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
10617 { |
|
27428
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
10618 if (EQ (XCAR (XCDR (tail)), dpyinfo->name_list_element)) |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10619 { |
|
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39950
diff
changeset
|
10620 XSETCDR (tail, XCDR (XCDR (tail))); |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10621 break; |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10622 } |
|
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
25633
diff
changeset
|
10623 tail = XCDR (tail); |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10624 } |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10625 } |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10626 |
|
27524
67501e6e8b34
(x_delete_display): Update next_noop_dpyinfo to ensure
Gerd Moellmann <gerd@gnu.org>
parents:
27500
diff
changeset
|
10627 if (next_noop_dpyinfo == dpyinfo) |
|
67501e6e8b34
(x_delete_display): Update next_noop_dpyinfo to ensure
Gerd Moellmann <gerd@gnu.org>
parents:
27500
diff
changeset
|
10628 next_noop_dpyinfo = dpyinfo->next; |
|
67501e6e8b34
(x_delete_display): Update next_noop_dpyinfo to ensure
Gerd Moellmann <gerd@gnu.org>
parents:
27500
diff
changeset
|
10629 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10630 if (x_display_list == dpyinfo) |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10631 x_display_list = dpyinfo->next; |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10632 else |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10633 { |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10634 struct x_display_info *tail; |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10635 |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10636 for (tail = x_display_list; tail; tail = tail->next) |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10637 if (tail->next == dpyinfo) |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10638 tail->next = tail->next->next; |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10639 } |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10640 |
|
12771
6f07c79d9a05
(x_delete_display) [AIX]: Don't call XRmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
12750
diff
changeset
|
10641 #ifndef USE_X_TOOLKIT /* I'm told Xt does this itself. */ |
|
6f07c79d9a05
(x_delete_display) [AIX]: Don't call XRmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
12750
diff
changeset
|
10642 #ifndef AIX /* On AIX, XCloseDisplay calls this. */ |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10643 XrmDestroyDatabase (dpyinfo->xrdb); |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10644 #endif |
|
12771
6f07c79d9a05
(x_delete_display) [AIX]: Don't call XRmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
12750
diff
changeset
|
10645 #endif |
| 11015 | 10646 #ifdef MULTI_KBOARD |
| 10647 if (--dpyinfo->kboard->reference_count == 0) | |
|
11166
0e9fad3ccf03
(x_delete_display): Extract kboard deletion, for modularity.
Karl Heuer <kwzh@gnu.org>
parents:
11162
diff
changeset
|
10648 delete_kboard (dpyinfo->kboard); |
|
10652
f6a41cb94a75
[MULTI_PERDISPLAY] (x_term_init): Initialize perdisplay.
Karl Heuer <kwzh@gnu.org>
parents:
10634
diff
changeset
|
10649 #endif |
|
27500
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
10650 #ifdef HAVE_X_I18N |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
10651 if (dpyinfo->xim) |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
10652 xim_close_dpy (dpyinfo); |
|
d33b4becc3ca
(x_display_cursor): Set XIC pre-edit area only if window
Gerd Moellmann <gerd@gnu.org>
parents:
27428
diff
changeset
|
10653 #endif |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10654 |
|
52753
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
10655 /* Free the font names in the font table. */ |
|
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
10656 for (i = 0; i < dpyinfo->n_fonts; i++) |
|
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
10657 if (dpyinfo->font_table[i].name) |
|
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
10658 { |
|
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
10659 if (dpyinfo->font_table[i].name != dpyinfo->font_table[i].full_name) |
|
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
10660 xfree (dpyinfo->font_table[i].full_name); |
|
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
10661 xfree (dpyinfo->font_table[i].name); |
|
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
10662 } |
|
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
10663 |
|
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
10664 if (dpyinfo->font_table->font_encoder) |
|
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
10665 xfree (dpyinfo->font_table->font_encoder); |
|
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
10666 |
|
10652
f6a41cb94a75
[MULTI_PERDISPLAY] (x_term_init): Initialize perdisplay.
Karl Heuer <kwzh@gnu.org>
parents:
10634
diff
changeset
|
10667 xfree (dpyinfo->font_table); |
|
f6a41cb94a75
[MULTI_PERDISPLAY] (x_term_init): Initialize perdisplay.
Karl Heuer <kwzh@gnu.org>
parents:
10634
diff
changeset
|
10668 xfree (dpyinfo->x_id_name); |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
10669 xfree (dpyinfo->color_cells); |
|
10652
f6a41cb94a75
[MULTI_PERDISPLAY] (x_term_init): Initialize perdisplay.
Karl Heuer <kwzh@gnu.org>
parents:
10634
diff
changeset
|
10670 xfree (dpyinfo); |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10671 } |
|
32607
00d2748a616a
(x_color_cells, x_query_colors, x_query_color): New
Gerd Moellmann <gerd@gnu.org>
parents:
32513
diff
changeset
|
10672 |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10673 #ifdef USE_X_TOOLKIT |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10674 |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10675 /* Atimer callback function for TIMER. Called every 0.1s to process |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10676 Xt timeouts, if needed. We must avoid calling XtAppPending as |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10677 much as possible because that function does an implicit XFlush |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10678 that slows us down. */ |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10679 |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10680 static void |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10681 x_process_timeouts (timer) |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10682 struct atimer *timer; |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10683 { |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10684 if (toolkit_scroll_bar_interaction || popup_activated ()) |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10685 { |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10686 BLOCK_INPUT; |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10687 while (XtAppPending (Xt_app_con) & XtIMTimer) |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10688 XtAppProcessEvent (Xt_app_con, XtIMTimer); |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10689 UNBLOCK_INPUT; |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10690 } |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10691 } |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10692 |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10693 #endif /* USE_X_TOOLKIT */ |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10694 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10695 |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10696 /* Set up use of X before we make the first connection. */ |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10697 |
|
50371
45e825260791
Remove unnecessary extern declarations.
Kim F. Storm <storm@cua.dk>
parents:
50327
diff
changeset
|
10698 extern frame_parm_handler x_frame_parm_handlers[]; |
|
45e825260791
Remove unnecessary extern declarations.
Kim F. Storm <storm@cua.dk>
parents:
50327
diff
changeset
|
10699 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10700 static struct redisplay_interface x_redisplay_interface = |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10701 { |
|
50371
45e825260791
Remove unnecessary extern declarations.
Kim F. Storm <storm@cua.dk>
parents:
50327
diff
changeset
|
10702 x_frame_parm_handlers, |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10703 x_produce_glyphs, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10704 x_write_glyphs, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10705 x_insert_glyphs, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10706 x_clear_end_of_line, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10707 x_scroll_run, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10708 x_after_update_window_line, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10709 x_update_window_begin, |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10710 x_update_window_end, |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10711 x_cursor_to, |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10712 x_flush, |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10713 #ifndef XFlush |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10714 x_flush, |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10715 #else |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10716 0, /* flush_display_optional */ |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10717 #endif |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10718 x_clear_window_mouse_face, |
|
25189
710445260df6
(x_draw_phys_cursor_glyph): Redraw overlaps.
Gerd Moellmann <gerd@gnu.org>
parents:
25150
diff
changeset
|
10719 x_get_glyph_overhangs, |
| 50097 | 10720 x_fix_overlapping_area, |
|
50151
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
10721 x_draw_fringe_bitmap, |
|
53888
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
10722 0, /* define_fringe_bitmap */ |
|
57b27e42bf9e
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
53785
diff
changeset
|
10723 0, /* destroy_fringe_bitmap */ |
|
50151
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
10724 x_per_char_metric, |
|
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
10725 x_encode_char, |
|
0e12b5894d99
Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50130
diff
changeset
|
10726 x_compute_glyph_string_overhangs, |
|
50237
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10727 x_draw_glyph_string, |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10728 x_define_frame_cursor, |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10729 x_clear_frame_area, |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10730 x_draw_window_cursor, |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10731 x_draw_vertical_window_border, |
|
160bd7db88a1
* xterm.c: Remove consolidated defines and code.
Kim F. Storm <storm@cua.dk>
parents:
50177
diff
changeset
|
10732 x_shift_glyphs_for_insert |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10733 }; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10734 |
| 21514 | 10735 void |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10736 x_initialize () |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10737 { |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10738 rif = &x_redisplay_interface; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10739 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10740 clear_frame_hook = x_clear_frame; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10741 ins_del_lines_hook = x_ins_del_lines; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10742 delete_glyphs_hook = x_delete_glyphs; |
| 286 | 10743 ring_bell_hook = XTring_bell; |
| 10744 reset_terminal_modes_hook = XTreset_terminal_modes; | |
| 10745 set_terminal_modes_hook = XTset_terminal_modes; | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10746 update_begin_hook = x_update_begin; |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10747 update_end_hook = x_update_end; |
| 286 | 10748 set_terminal_window_hook = XTset_terminal_window; |
| 10749 read_socket_hook = XTread_socket; | |
|
6616
951c8941b931
[INCLUDED_FCNTL]: Don't include fcntl.h again.
Richard M. Stallman <rms@gnu.org>
parents:
6560
diff
changeset
|
10750 frame_up_to_date_hook = XTframe_up_to_date; |
|
1720
4f5e3ac5d822
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1658
diff
changeset
|
10751 mouse_position_hook = XTmouse_position; |
| 771 | 10752 frame_rehighlight_hook = XTframe_rehighlight; |
|
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1810
diff
changeset
|
10753 frame_raise_lower_hook = XTframe_raise_lower; |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
10754 set_vertical_scroll_bar_hook = XTset_vertical_scroll_bar; |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
10755 condemn_scroll_bars_hook = XTcondemn_scroll_bars; |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
10756 redeem_scroll_bar_hook = XTredeem_scroll_bar; |
|
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
10757 judge_scroll_bars_hook = XTjudge_scroll_bars; |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
10758 |
| 771 | 10759 scroll_region_ok = 1; /* we'll scroll partial frames */ |
|
35393
2470cdee5ed8
(x_initialize): Set char_ins_del_ok to 1.
Gerd Moellmann <gerd@gnu.org>
parents:
35367
diff
changeset
|
10760 char_ins_del_ok = 1; |
| 286 | 10761 line_ins_del_ok = 1; /* we'll just blt 'em */ |
| 10762 fast_clear_end_of_line = 1; /* X does this well */ | |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
10763 memory_below_frame = 0; /* we don't remember what scrolls |
| 286 | 10764 off the bottom */ |
| 10765 baud_rate = 19200; | |
| 10766 | |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10767 x_noop_count = 0; |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25541
diff
changeset
|
10768 last_tool_bar_item = -1; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10769 any_help_event_p = 0; |
|
54651
ee25175db902
(x_initialize): Initialize ignore_next_mouse_click_timeout.
Kim F. Storm <storm@cua.dk>
parents:
54650
diff
changeset
|
10770 ignore_next_mouse_click_timeout = 0; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10771 |
|
54173
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
10772 #ifdef USE_GTK |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
10773 current_count = -1; |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
10774 #endif |
|
03cb01738926
(x_focus_changed, x_detect_focus_change): Remove
Kim F. Storm <storm@cua.dk>
parents:
53933
diff
changeset
|
10775 |
|
4476
e7de1b007447
(x_term_init): Set the hooks before we call Fset_input_mode.
Richard M. Stallman <rms@gnu.org>
parents:
4304
diff
changeset
|
10776 /* Try to use interrupt input; if we can't, then start polling. */ |
|
e7de1b007447
(x_term_init): Set the hooks before we call Fset_input_mode.
Richard M. Stallman <rms@gnu.org>
parents:
4304
diff
changeset
|
10777 Fset_input_mode (Qt, Qnil, Qt, Qnil); |
|
e7de1b007447
(x_term_init): Set the hooks before we call Fset_input_mode.
Richard M. Stallman <rms@gnu.org>
parents:
4304
diff
changeset
|
10778 |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10779 #ifdef USE_X_TOOLKIT |
|
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10780 XtToolkitInitialize (); |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
10781 |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10782 Xt_app_con = XtCreateApplicationContext (); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10783 |
|
37143
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
10784 /* Register a converter from strings to pixels, which uses |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
10785 Emacs' color allocation infrastructure. */ |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
10786 XtAppSetTypeConverter (Xt_app_con, |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
10787 XtRString, XtRPixel, cvt_string_to_pixel, |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
10788 cvt_string_to_pixel_args, |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
10789 XtNumber (cvt_string_to_pixel_args), |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
10790 XtCacheByDisplay, cvt_pixel_dtor); |
|
187f754d89cc
(x_alloc_nearest_color_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37033
diff
changeset
|
10791 |
|
12494
bfbe2490dbf0
(x_initialize) [USE_X_TOOLKIT]: Set fallback resources.
Richard M. Stallman <rms@gnu.org>
parents:
12431
diff
changeset
|
10792 XtAppSetFallbackResources (Xt_app_con, Xt_default_resources); |
|
27428
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
10793 |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
10794 /* Install an asynchronous timer that processes Xt timeout events |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
10795 every 0.1s. This is necessary because some widget sets use |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
10796 timeouts internally, for example the LessTif menu bar, or the |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
10797 Xaw3d scroll bar. When Xt timouts aren't processed, these |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
10798 widgets don't behave normally. */ |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
10799 { |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
10800 EMACS_TIME interval; |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
10801 EMACS_SET_SECS_USECS (interval, 0, 100000); |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
10802 start_atimer (ATIMER_CONTINUOUS, interval, x_process_timeouts, 0); |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
10803 } |
|
c8b20597f0fd
(toplevel): Include atimer.h.
Gerd Moellmann <gerd@gnu.org>
parents:
27040
diff
changeset
|
10804 #endif |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10805 |
|
34066
2482c17f546e
Test USE_TOOLKIT_SCROLL_BARS everywhere with #ifdef and
Gerd Moellmann <gerd@gnu.org>
parents:
34030
diff
changeset
|
10806 #ifdef USE_TOOLKIT_SCROLL_BARS |
| 49322 | 10807 #ifndef USE_GTK |
|
26789
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
10808 xaw3d_arrow_scroll = False; |
|
03a6016a38bf
(#includes): Allow compilation with only Xaw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26633
diff
changeset
|
10809 xaw3d_pick_top = True; |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10810 #endif |
| 49322 | 10811 #endif |
|
9741
bd9d06e542c6
(x_delete_display): Call XrmDestroyDatabase.
Richard M. Stallman <rms@gnu.org>
parents:
9704
diff
changeset
|
10812 |
|
9537
f025140f7ff7
(stuffline, scraplines): Functions deleted.
Karl Heuer <kwzh@gnu.org>
parents:
9526
diff
changeset
|
10813 /* Note that there is no real way portable across R3/R4 to get the |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
10814 original error handler. */ |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
10815 XSetErrorHandler (x_error_handler); |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10816 XSetIOErrorHandler (x_io_error_quitter); |
| 286 | 10817 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10818 /* Disable Window Change signals; they are handled by X events. */ |
| 286 | 10819 #ifdef SIGWINCH |
| 10820 signal (SIGWINCH, SIG_DFL); | |
|
44763
f6ac4d8b01cd
Fix misleading comment after #endif.
Pavel Jan?k <Pavel@Janik.cz>
parents:
44708
diff
changeset
|
10821 #endif /* SIGWINCH */ |
|
1052
b8defcaf1b61
* xterm.c (x_make_frame_invisible): Don't forget to check the
Jim Blandy <jimb@redhat.com>
parents:
1020
diff
changeset
|
10822 |
|
10743
6977bff3ff38
(x_display_bar_cursor): Use frame's cursor_width.
Richard M. Stallman <rms@gnu.org>
parents:
10652
diff
changeset
|
10823 signal (SIGPIPE, x_connection_signal); |
| 286 | 10824 } |
| 395 | 10825 |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10826 |
| 395 | 10827 void |
| 10828 syms_of_xterm () | |
| 10829 { | |
|
17607
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
10830 staticpro (&x_error_message_string); |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
10831 x_error_message_string = Qnil; |
|
251e103f2d53
(XTmouse_position, x_term_init):
Richard M. Stallman <rms@gnu.org>
parents:
17575
diff
changeset
|
10832 |
|
9704
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10833 staticpro (&x_display_name_list); |
|
39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
Richard M. Stallman <rms@gnu.org>
parents:
9654
diff
changeset
|
10834 x_display_name_list = Qnil; |
|
9654
41681efe1086
Use FRAME_X_DISPLAY instead of x_current_display and XDISPLAY.
Richard M. Stallman <rms@gnu.org>
parents:
9577
diff
changeset
|
10835 |
|
1993
645d96bd3daf
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1935
diff
changeset
|
10836 staticpro (&last_mouse_scroll_bar); |
|
4948
7653c78ac0c1
(syms_of_xterm): Initialize last_mouse_scroll_bar.
Richard M. Stallman <rms@gnu.org>
parents:
4909
diff
changeset
|
10837 last_mouse_scroll_bar = Qnil; |
|
11807
73fb6570f718
(Qvendor_specific_keysyms): New var.
Karl Heuer <kwzh@gnu.org>
parents:
11610
diff
changeset
|
10838 |
|
73fb6570f718
(Qvendor_specific_keysyms): New var.
Karl Heuer <kwzh@gnu.org>
parents:
11610
diff
changeset
|
10839 staticpro (&Qvendor_specific_keysyms); |
|
73fb6570f718
(Qvendor_specific_keysyms): New var.
Karl Heuer <kwzh@gnu.org>
parents:
11610
diff
changeset
|
10840 Qvendor_specific_keysyms = intern ("vendor-specific-keysyms"); |
|
15803
f214673e68a8
(XTread_socket): Pass keys in menu bar to toolkit alone
Richard M. Stallman <rms@gnu.org>
parents:
15794
diff
changeset
|
10841 |
|
44626
404f74d6dc4a
(Qlatin_1, Qutf_8): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44533
diff
changeset
|
10842 staticpro (&Qutf_8); |
|
404f74d6dc4a
(Qlatin_1, Qutf_8): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44533
diff
changeset
|
10843 Qutf_8 = intern ("utf-8"); |
|
404f74d6dc4a
(Qlatin_1, Qutf_8): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44533
diff
changeset
|
10844 staticpro (&Qlatin_1); |
|
404f74d6dc4a
(Qlatin_1, Qutf_8): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44533
diff
changeset
|
10845 Qlatin_1 = intern ("latin-1"); |
|
404f74d6dc4a
(Qlatin_1, Qutf_8): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44533
diff
changeset
|
10846 |
|
15803
f214673e68a8
(XTread_socket): Pass keys in menu bar to toolkit alone
Richard M. Stallman <rms@gnu.org>
parents:
15794
diff
changeset
|
10847 staticpro (&last_mouse_press_frame); |
|
f214673e68a8
(XTread_socket): Pass keys in menu bar to toolkit alone
Richard M. Stallman <rms@gnu.org>
parents:
15794
diff
changeset
|
10848 last_mouse_press_frame = Qnil; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10849 |
|
37153
3799cab1815b
(x_use_underline_position_properties): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37143
diff
changeset
|
10850 DEFVAR_BOOL ("x-use-underline-position-properties", |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
10851 &x_use_underline_position_properties, |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
10852 doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. |
| 42206 | 10853 nil means ignore them. If you encounter fonts with bogus |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39821
diff
changeset
|
10854 UNDERLINE_POSITION font properties, for example 7x13 on XFree prior |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39821
diff
changeset
|
10855 to 4.1, set this to nil. */); |
|
37153
3799cab1815b
(x_use_underline_position_properties): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37143
diff
changeset
|
10856 x_use_underline_position_properties = 1; |
|
3799cab1815b
(x_use_underline_position_properties): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
37143
diff
changeset
|
10857 |
|
54650
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
10858 DEFVAR_BOOL ("x-mouse-click-focus-ignore-position", |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
10859 &x_mouse_click_focus_ignore_position, |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
10860 doc: /* Non-nil means that a mouse click to focus a frame does not move point. |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
10861 This variable is only used when the window manager requires that you |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
10862 click on a frame to select it (give it focus). In that case, a value |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
10863 of nil, means that the selected window and cursor position changes to |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
10864 reflect the mouse click position, while a non-nil value means that the |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
10865 selected window or cursor position is preserved. */); |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
10866 x_mouse_click_focus_ignore_position = 0; |
|
9dc8330eda34
(x_mouse_click_focus_ignore_position): New var.
Kim F. Storm <storm@cua.dk>
parents:
54451
diff
changeset
|
10867 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
10868 DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars, |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39973
diff
changeset
|
10869 doc: /* What X toolkit scroll bars Emacs uses. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39821
diff
changeset
|
10870 A value of nil means Emacs doesn't use X toolkit scroll bars. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39821
diff
changeset
|
10871 Otherwise, value is a symbol describing the X toolkit. */); |
|
34066
2482c17f546e
Test USE_TOOLKIT_SCROLL_BARS everywhere with #ifdef and
Gerd Moellmann <gerd@gnu.org>
parents:
34030
diff
changeset
|
10872 #ifdef USE_TOOLKIT_SCROLL_BARS |
|
34869
1d671133e618
(syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars
Gerd Moellmann <gerd@gnu.org>
parents:
34673
diff
changeset
|
10873 #ifdef USE_MOTIF |
|
1d671133e618
(syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars
Gerd Moellmann <gerd@gnu.org>
parents:
34673
diff
changeset
|
10874 Vx_toolkit_scroll_bars = intern ("motif"); |
|
1d671133e618
(syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars
Gerd Moellmann <gerd@gnu.org>
parents:
34673
diff
changeset
|
10875 #elif defined HAVE_XAW3D |
|
1d671133e618
(syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars
Gerd Moellmann <gerd@gnu.org>
parents:
34673
diff
changeset
|
10876 Vx_toolkit_scroll_bars = intern ("xaw3d"); |
| 49322 | 10877 #elif USE_GTK |
| 10878 Vx_toolkit_scroll_bars = intern ("gtk"); | |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10879 #else |
|
34869
1d671133e618
(syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars
Gerd Moellmann <gerd@gnu.org>
parents:
34673
diff
changeset
|
10880 Vx_toolkit_scroll_bars = intern ("xaw"); |
|
1d671133e618
(syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars
Gerd Moellmann <gerd@gnu.org>
parents:
34673
diff
changeset
|
10881 #endif |
|
1d671133e618
(syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars
Gerd Moellmann <gerd@gnu.org>
parents:
34673
diff
changeset
|
10882 #else |
|
1d671133e618
(syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars
Gerd Moellmann <gerd@gnu.org>
parents:
34673
diff
changeset
|
10883 Vx_toolkit_scroll_bars = Qnil; |
|
24991
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10884 #endif |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10885 |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10886 staticpro (&last_mouse_motion_frame); |
|
53d428012caf
Display-related functions implemented from scratch. Add toolkit
Gerd Moellmann <gerd@gnu.org>
parents:
24941
diff
changeset
|
10887 last_mouse_motion_frame = Qnil; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10888 |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10889 Qmodifier_value = intern ("modifier-value"); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10890 Qalt = intern ("alt"); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10891 Fput (Qalt, Qmodifier_value, make_number (alt_modifier)); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10892 Qhyper = intern ("hyper"); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10893 Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier)); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10894 Qmeta = intern ("meta"); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10895 Fput (Qmeta, Qmodifier_value, make_number (meta_modifier)); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10896 Qsuper = intern ("super"); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10897 Fput (Qsuper, Qmodifier_value, make_number (super_modifier)); |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10898 |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10899 DEFVAR_LISP ("x-alt-keysym", &Vx_alt_keysym, |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10900 doc: /* Which keys Emacs uses for the alt modifier. |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10901 This should be one of the symbols `alt', `hyper', `meta', `super'. |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10902 For example, `alt' means use the Alt_L and Alt_R keysyms. The default |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10903 is nil, which is the same as `alt'. */); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10904 Vx_alt_keysym = Qnil; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10905 |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10906 DEFVAR_LISP ("x-hyper-keysym", &Vx_hyper_keysym, |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10907 doc: /* Which keys Emacs uses for the hyper modifier. |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10908 This should be one of the symbols `alt', `hyper', `meta', `super'. |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10909 For example, `hyper' means use the Hyper_L and Hyper_R keysyms. The |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10910 default is nil, which is the same as `hyper'. */); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10911 Vx_hyper_keysym = Qnil; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10912 |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10913 DEFVAR_LISP ("x-meta-keysym", &Vx_meta_keysym, |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10914 doc: /* Which keys Emacs uses for the meta modifier. |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10915 This should be one of the symbols `alt', `hyper', `meta', `super'. |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10916 For example, `meta' means use the Meta_L and Meta_R keysyms. The |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10917 default is nil, which is the same as `meta'. */); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10918 Vx_meta_keysym = Qnil; |
|
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47766
diff
changeset
|
10919 |
|
43302
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10920 DEFVAR_LISP ("x-super-keysym", &Vx_super_keysym, |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10921 doc: /* Which keys Emacs uses for the super modifier. |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10922 This should be one of the symbols `alt', `hyper', `meta', `super'. |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10923 For example, `super' means use the Super_L and Super_R keysyms. The |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10924 default is nil, which is the same as `super'. */); |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10925 Vx_super_keysym = Qnil; |
|
2f479ac769e1
(Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym)
Kai Gro?johann <kgrossjo@eu.uu.net>
parents:
42996
diff
changeset
|
10926 |
| 48085 | 10927 DEFVAR_LISP ("x-keysym-table", &Vx_keysym_table, |
| 10928 doc: /* Hash table of character codes indexed by X keysym codes. */); | |
| 10929 Vx_keysym_table = make_hash_table (Qeql, make_number (900), | |
| 10930 make_float (DEFAULT_REHASH_SIZE), | |
| 10931 make_float (DEFAULT_REHASH_THRESHOLD), | |
| 10932 Qnil, Qnil, Qnil); | |
| 395 | 10933 } |
|
14694
41de9b2640a1
(X_CONNECTION_LOCK_FLAG): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
14692
diff
changeset
|
10934 |
| 39096 | 10935 #endif /* HAVE_X_WINDOWS */ |
| 52401 | 10936 |
| 10937 /* arch-tag: 6d4e4cb7-abc1-4302-9585-d84dcfb09d0f | |
| 10938 (do not change this comment) */ |
