annotate src/redisplay-x.c @ 422:95016f13131a r21-2-19

Import from CVS: tag r21-2-19
author cvs
date Mon, 13 Aug 2007 11:25:01 +0200
parents 41dbb7a9d5f2
children 11054d720c21
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 /* X output and frame manipulation routines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 Copyright (C) 1994 Lucid, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 Copyright (C) 1995 Sun Microsystems, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 under the terms of the GNU General Public License as published by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 Free Software Foundation; either version 2, or (at your option) any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 along with XEmacs; see the file COPYING. If not, write to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 Boston, MA 02111-1307, USA. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 /* Synched up with: Not in FSF. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 /* Author: Chuck Thompson */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 /* Lots of work done by Ben Wing for Mule */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 #include <config.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 #include "lisp.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 #include "console-x.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 #include "EmacsFrame.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 #include "EmacsFrameP.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 #include "xgccache.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 #include "glyphs-x.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 #include "objects-x.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 #include "buffer.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 #include "debug.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 #include "faces.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 #include "frame.h"
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
43 #include "gutter.h"
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 #include "redisplay.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 #include "sysdep.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 #include "window.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 #include <X11/bitmaps/gray>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 #include "sysproc.h" /* for select() */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
51 #ifdef MULE
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 209
diff changeset
52 #include "mule-ccl.h"
259
11cf20601dec Import from CVS: tag r20-5b28
cvs
parents: 251
diff changeset
53 #include "file-coding.h" /* for CCL conversion */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
54 #endif
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 14
diff changeset
55
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 /* Number of pixels below each line. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
57 /* #### implement me */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
58 int x_interline_space;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 #define EOL_CURSOR_WIDTH 5
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
62 static void x_output_pixmap (struct window *w, struct display_line *dl,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
63 Lisp_Object image_instance, int xpos,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
64 int xoffset,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
65 int start_pixpos, int width, face_index findex,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
66 int cursor_start, int cursor_width,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
67 int cursor_height);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 static void x_output_vertical_divider (struct window *w, int clear);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 static void x_output_blank (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 struct rune *rb, int start_pixpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 int cursor_start, int cursor_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 static void x_output_hline (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 struct rune *rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 static void x_redraw_exposed_window (struct window *w, int x, int y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 int width, int height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 static void x_redraw_exposed_windows (Lisp_Object window, int x, int y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 int width, int height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 static void x_output_eol_cursor (struct window *w, struct display_line *dl,
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 259
diff changeset
79 int xpos, face_index findex);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 static void x_clear_frame (struct frame *f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 static void x_clear_frame_windows (Lisp_Object window);
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
82 void bevel_modeline (struct window *w, struct display_line *dl);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 /* Note: We do not use the Xmb*() functions and XFontSets.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 Those functions are generally losing for a number of reasons:
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
87
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 1) They only support one locale (e.g. you could display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 Japanese and ASCII text, but not mixed Japanese/Chinese
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 text). You could maybe call setlocale() frequently
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 to try to deal with this, but that would generally
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 fail because an XFontSet is tied to one locale and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 won't have the other character sets in it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 2) Not all (or even very many) OS's support the useful
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 locales. For example, as far as I know SunOS and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 Solaris only support the Japanese locale if you get the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 special Asian-language version of the OS. Yuck yuck
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 yuck. Linux doesn't support the Japanese locale at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 all.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 3) The locale support in X only exists in R5, not in R4.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 (Not sure how big of a problem this is: how many
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 people are using R4?)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 4) Who knows if the multi-byte text format (which is locale-
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 specific) is even the same for the same locale on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 different OS's? It's not even documented anywhere that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 I can find what the multi-byte text format for the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 Japanese locale under SunOS and Solaris is, but I assume
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 it's EUC.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 struct textual_run
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 Lisp_Object charset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 unsigned char *ptr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 int len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 int dimension;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 /* Separate out the text in DYN into a series of textual runs of a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 particular charset. Also convert the characters as necessary into
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 the format needed by XDrawImageString(), XDrawImageString16(), et
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 al. (This means converting to one or two byte format, possibly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 tweaking the high bits, and possibly running a CCL program.) You
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 must pre-allocate the space used and pass it in. (This is done so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 you can alloca() the space.) You need to allocate (2 * len) bytes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 of TEXT_STORAGE and (len * sizeof (struct textual_run)) bytes of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 RUN_STORAGE, where LEN is the length of the dynarr.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 Returns the number of runs actually used. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 separate_textual_runs (unsigned char *text_storage,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 struct textual_run *run_storage,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
134 CONST Emchar *str, Charcount len)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 Lisp_Object prev_charset = Qunbound; /* not Qnil because that is a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 possible valid charset when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 MULE is not defined */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 int runs_so_far = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 int i;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
141 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
142 struct ccl_program char_converter;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
143 int need_ccl_conversion = 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
144 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 for (i = 0; i < len; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 Emchar ch = str[i];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149 Lisp_Object charset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 int byte1, byte2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 int dimension;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152 int graphic;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154 BREAKUP_CHAR (ch, charset, byte1, byte2);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
155 dimension = XCHARSET_DIMENSION (charset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156 graphic = XCHARSET_GRAPHIC (charset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 if (!EQ (charset, prev_charset))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 run_storage[runs_so_far].ptr = text_storage;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 run_storage[runs_so_far].charset = charset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 run_storage[runs_so_far].dimension = dimension;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
163
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 if (runs_so_far)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 run_storage[runs_so_far - 1].len =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 text_storage - run_storage[runs_so_far - 1].ptr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 if (run_storage[runs_so_far - 1].dimension == 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 run_storage[runs_so_far - 1].len >>= 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 runs_so_far++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 prev_charset = charset;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
173 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
174 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
175 Lisp_Object ccl_prog = XCHARSET_CCL_PROGRAM (charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
176 need_ccl_conversion = !NILP (ccl_prog);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
177 if (need_ccl_conversion)
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 209
diff changeset
178 setup_ccl_program (&char_converter, ccl_prog);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
179 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
180 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 if (graphic == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 byte1 &= 0x7F;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 byte2 &= 0x7F;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 else if (graphic == 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 byte1 |= 0x80;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 byte2 |= 0x80;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 }
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
193 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
194 if (need_ccl_conversion)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
195 {
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 209
diff changeset
196 char_converter.reg[0] = XCHARSET_ID (charset);
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 209
diff changeset
197 char_converter.reg[1] = byte1;
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 209
diff changeset
198 char_converter.reg[2] = byte2;
418
e804706bfb8c Import from CVS: tag r21-2-17
cvs
parents: 412
diff changeset
199 ccl_driver (&char_converter, 0, 0, 0, 0, CCL_MODE_ENCODING);
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 209
diff changeset
200 byte1 = char_converter.reg[1];
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 209
diff changeset
201 byte2 = char_converter.reg[2];
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
202 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
203 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 *text_storage++ = (unsigned char) byte1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 if (dimension == 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206 *text_storage++ = (unsigned char) byte2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209 if (runs_so_far)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 run_storage[runs_so_far - 1].len =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 text_storage - run_storage[runs_so_far - 1].ptr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 if (run_storage[runs_so_far - 1].dimension == 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 run_storage[runs_so_far - 1].len >>= 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
217 return runs_so_far;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 /****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222 /* X output routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224 /****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227 x_text_width_single_run (struct face_cachel *cachel, struct textual_run *run)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 Lisp_Object font_inst = FACE_CACHEL_FONT (cachel, run->charset);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
230 struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font_inst);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 if (!fi->proportional_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 return fi->width * run->len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 if (run->dimension == 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 return XTextWidth16 (FONT_INSTANCE_X_FONT (fi),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 (XChar2b *) run->ptr, run->len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 return XTextWidth (FONT_INSTANCE_X_FONT (fi),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 (char *) run->ptr, run->len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 x_text_width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 Given a string and a face, return the string's length in pixels when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 displayed in the font associated with the face.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 static int
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
252 x_text_width (struct frame *f, struct face_cachel *cachel, CONST Emchar *str,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 Charcount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 int width_so_far = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 unsigned char *text_storage = (unsigned char *) alloca (2 * len);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
257 struct textual_run *runs = alloca_array (struct textual_run, len);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 int nruns;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 int i;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
260
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 nruns = separate_textual_runs (text_storage, runs, str, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 for (i = 0; i < nruns; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 width_so_far += x_text_width_single_run (cachel, runs + i);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 return width_so_far;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270 x_divider_height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 Return the height of the horizontal divider. This is a function because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 divider_height is a device method.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 #### If we add etched horizontal divider lines this will have to get
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 smarter.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 x_divider_height (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 x_eol_cursor_width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 Return the width of the end-of-line cursor. This is a function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 because eol_cursor_width is a device method.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 x_eol_cursor_width (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 return EOL_CURSOR_WIDTH;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296 /*****************************************************************************
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
297 x_output_begin
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299 Perform any necessary initialization prior to an update.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 static void
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
302 x_output_begin (struct device *d)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306 /*****************************************************************************
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
307 x_output_end
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 Perform any necessary flushing of queues when an update has completed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 static void
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
312 x_output_end (struct device *d)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
314 XFlush (DEVICE_X_DISPLAY (d));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318 x_output_display_block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 Given a display line, a block number for that start line, output all
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321 runes between start and end in the specified display block.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324 x_output_display_block (struct window *w, struct display_line *dl, int block,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325 int start, int end, int start_pixpos, int cursor_start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 int cursor_width, int cursor_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 struct frame *f = XFRAME (w->frame);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
329 Emchar_dynarr *buf = Dynarr_new (Emchar);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333 rune_dynarr *rba = db->runes;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334 struct rune *rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 int elt = start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 face_index findex;
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
338 int xpos, width = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 Lisp_Object charset = Qunbound; /* Qnil is a valid charset when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340 MULE is not defined */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 rb = Dynarr_atp (rba, start);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345 if (!rb)
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
346 /* Nothing to do so don't do anything. */
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
347 return;
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
348
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
349 findex = rb->findex;
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
350 xpos = rb->xpos;
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
351 if (rb->type == RUNE_CHAR)
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
352 charset = CHAR_CHARSET (rb->object.chr.ch);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 if (end < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 end = Dynarr_length (rba);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 Dynarr_reset (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 while (elt < end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360 rb = Dynarr_atp (rba, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362 if (rb->findex == findex && rb->type == RUNE_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
363 && rb->object.chr.ch != '\n' && rb->cursor_type != CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
364 && EQ (charset, CHAR_CHARSET (rb->object.chr.ch)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366 Dynarr_add (buf, rb->object.chr.ch);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 width += rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 if (Dynarr_length (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374 x_output_string (w, dl, buf, xpos, 0, start_pixpos, width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 findex, 0, cursor_start, cursor_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 cursor_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 xpos = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378 width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 Dynarr_reset (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 if (rb->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385 findex = rb->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 xpos = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 charset = CHAR_CHARSET (rb->object.chr.ch);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389 if (rb->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 if (rb->object.chr.ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 {
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 259
diff changeset
393 x_output_eol_cursor (w, dl, xpos, findex);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397 Dynarr_add (buf, rb->object.chr.ch);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 x_output_string (w, dl, buf, xpos, 0, start_pixpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399 rb->width, findex, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400 cursor_start, cursor_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 cursor_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 Dynarr_reset (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 xpos += rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 else if (rb->object.chr.ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 /* Clear in case a cursor was formerly here. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
411 int height = dl->ascent + dl->descent - dl->clip;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
413 redisplay_clear_region (window, findex, xpos, dl->ypos - dl->ascent,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
414 rb->width, height);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 else if (rb->type == RUNE_BLANK || rb->type == RUNE_HLINE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 if (rb->type == RUNE_BLANK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 x_output_blank (w, dl, rb, start_pixpos, cursor_start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422 cursor_width);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
423 else
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 /* #### Our flagging of when we need to redraw the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 modeline shadows sucks. Since RUNE_HLINE is only used
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 by the modeline at the moment it is a good bet
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 that if it gets redrawn then we should also
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 redraw the shadows. This won't be true forever.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 We borrow the shadow_thickness_changed flag for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 now. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 w->shadow_thickness_changed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 x_output_hline (w, dl, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 if (elt < end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 rb = Dynarr_atp (rba, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 findex = rb->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 xpos = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 else if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 Lisp_Object instance;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 instance = glyph_image_instance (rb->object.dglyph.glyph,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 window, ERROR_ME_NOT, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 findex = rb->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 if (IMAGE_INSTANCEP (instance))
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
455 switch (XIMAGE_INSTANCE_TYPE (instance))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
456 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
457 case IMAGE_TEXT:
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
459 /* #### This is way losing. See the comment in
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
460 add_glyph_rune(). */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
461 Lisp_Object string =
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
462 XIMAGE_INSTANCE_TEXT_STRING (instance);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
463 convert_bufbyte_string_into_emchar_dynarr
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
464 (XSTRING_DATA (string), XSTRING_LENGTH (string), buf);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
465
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
466 x_output_string (w, dl, buf, xpos,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
467 rb->object.dglyph.xoffset,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
468 start_pixpos, -1, findex,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
469 (rb->cursor_type == CURSOR_ON),
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
470 cursor_start, cursor_width,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
471 cursor_height);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
472 Dynarr_reset (buf);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 }
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
474 break;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
475
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
476 case IMAGE_MONO_PIXMAP:
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
477 case IMAGE_COLOR_PIXMAP:
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
478 x_output_pixmap (w, dl, instance, xpos,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
479 rb->object.dglyph.xoffset, start_pixpos,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
480 rb->width, findex, cursor_start,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
481 cursor_width, cursor_height);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
482 break;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
483
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
484 case IMAGE_POINTER:
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
485 abort ();
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
486
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
487 case IMAGE_WIDGET:
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
488 case IMAGE_SUBWINDOW:
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
489 redisplay_output_subwindow (w, dl, instance, xpos,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
490 rb->object.dglyph.xoffset, start_pixpos,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
491 rb->width, findex, cursor_start,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
492 cursor_width, cursor_height);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
493
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
494 case IMAGE_NOTHING:
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
495 /* nothing is as nothing does */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
496 break;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
497
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
498 default:
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
499 abort ();
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
500 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 xpos += rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 if (Dynarr_length (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 x_output_string (w, dl, buf, xpos, 0, start_pixpos, width, findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 0, cursor_start, cursor_width, cursor_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 /* #### This is really conditionalized well for optimized
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 performance. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 if (dl->modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 && !EQ (Qzero, w->modeline_shadow_thickness)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518 && (f->clear
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 || f->windows_structure_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 || w->shadow_thickness_changed))
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
521 bevel_modeline (w, dl);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 Dynarr_free (buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 /*****************************************************************************
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
527 x_bevel_area
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
529 Draw a shadows for the given area in the given face.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 static void
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
532 x_bevel_area (struct window *w, face_index findex,
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
533 int x, int y, int width, int height,
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
534 int shadow_thickness)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 struct device *d = XDEVICE (f->device);
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
538
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
539 EmacsFrame ef = (EmacsFrame) FRAME_X_TEXT_WIDGET (f);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 Display *dpy = DEVICE_X_DISPLAY (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 Pixel top_shadow_pixel, bottom_shadow_pixel, background_pixel;
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
543 Lisp_Object tmp_pixel;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 XColor tmp_color;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 XGCValues gcv;
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
546 GC top_shadow_gc, bottom_shadow_gc, background_gc;
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
547
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 int use_pixmap = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 int flip_gcs = 0;
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
550 unsigned long mask;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 memset (&gcv, ~0, sizeof (XGCValues));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
554 tmp_pixel = WINDOW_FACE_CACHEL_BACKGROUND (w, findex);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 tmp_color = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 /* First, get the GC's. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 top_shadow_pixel = tmp_color.pixel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 bottom_shadow_pixel = tmp_color.pixel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 background_pixel = tmp_color.pixel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 x_generate_shadow_pixels (f, &top_shadow_pixel, &bottom_shadow_pixel,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 background_pixel, ef->core.background_pixel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
565 tmp_pixel = WINDOW_FACE_CACHEL_FOREGROUND (w, findex);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 tmp_color = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 gcv.background = tmp_color.pixel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 gcv.graphics_exposures = False;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 mask = GCForeground | GCBackground | GCGraphicsExposures;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
571 /* If we can't distinguish one of the shadows (the color is the same as the
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
572 background), it's better to use a pixmap to generate a dithered gray. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 if (top_shadow_pixel == background_pixel ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 bottom_shadow_pixel == background_pixel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 use_pixmap = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 if (use_pixmap)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 if (DEVICE_X_GRAY_PIXMAP (d) == None)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 DEVICE_X_GRAY_PIXMAP (d) =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 XCreatePixmapFromBitmapData (dpy, x_win, (char *) gray_bits,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 gray_width, gray_height, 1, 0, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
586 tmp_pixel = WINDOW_FACE_CACHEL_BACKGROUND (w, findex);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587 tmp_color = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588 gcv.foreground = tmp_color.pixel;
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
589 /* this is needed because the GC draws with a pixmap here */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 gcv.fill_style = FillOpaqueStippled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591 gcv.stipple = DEVICE_X_GRAY_PIXMAP (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 top_shadow_gc = gc_cache_lookup (DEVICE_X_GC_CACHE (d), &gcv,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 (mask | GCStipple | GCFillStyle));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
595 tmp_pixel = WINDOW_FACE_CACHEL_FOREGROUND (w, findex);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 tmp_color = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597 bottom_shadow_pixel = tmp_color.pixel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 flip_gcs = (bottom_shadow_pixel ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 WhitePixelOfScreen (DefaultScreenOfDisplay (dpy)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 gcv.foreground = top_shadow_pixel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 top_shadow_gc = gc_cache_lookup (DEVICE_X_GC_CACHE (d), &gcv, mask);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 gcv.foreground = bottom_shadow_pixel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 bottom_shadow_gc = gc_cache_lookup (DEVICE_X_GC_CACHE (d), &gcv, mask);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 if (use_pixmap && flip_gcs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 GC tmp_gc = bottom_shadow_gc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 bottom_shadow_gc = top_shadow_gc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 top_shadow_gc = tmp_gc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 gcv.foreground = background_pixel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 background_gc = gc_cache_lookup (DEVICE_X_GC_CACHE (d), &gcv, mask);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
621 /* possibly revert the GC's in case the shadow thickness is < 0.
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
622 This will give a depressed look to the divider */
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
623 if (shadow_thickness < 0)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 GC temp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 temp = top_shadow_gc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 top_shadow_gc = bottom_shadow_gc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629 bottom_shadow_gc = temp;
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
630
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
631 /* better avoid a Bad Address XLib error ;-) */
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
632 shadow_thickness = - shadow_thickness;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
635 /* Draw the shadows around the divider line */
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
636 x_output_shadows (f, x, y, width, height,
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
637 top_shadow_gc, bottom_shadow_gc,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
638 background_gc, shadow_thickness);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 x_get_gc
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 Given a number of parameters return a GC with those properties.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 static GC
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 x_get_gc (struct device *d, Lisp_Object font, Lisp_Object fg, Lisp_Object bg,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 Lisp_Object bg_pmap, Lisp_Object lwidth)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 XGCValues gcv;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651 unsigned long mask;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 memset (&gcv, ~0, sizeof (XGCValues));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 gcv.graphics_exposures = False;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655 /* Make absolutely sure that we don't pick up a clipping region in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656 the GC returned by this function. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 gcv.clip_mask = None;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 gcv.clip_x_origin = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659 gcv.clip_y_origin = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660 gcv.fill_style = FillSolid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661 mask = GCGraphicsExposures | GCClipMask | GCClipXOrigin | GCClipYOrigin;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662 mask |= GCFillStyle;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664 if (!NILP (font))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 gcv.font = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font))->fid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 mask |= GCFont;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 /* evil kludge! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671 if (!NILP (fg) && !COLOR_INSTANCEP (fg) && !INTP (fg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 /* #### I fixed once case where this was getting it. It was a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 bad macro expansion (compiler bug). */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
675 fprintf (stderr, "Help! x_get_gc got a bogus fg value! fg = ");
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 debug_print (fg);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677 fg = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680 if (!NILP (fg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 if (COLOR_INSTANCEP (fg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 gcv.foreground = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (fg)).pixel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 gcv.foreground = XINT (fg);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686 mask |= GCForeground;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689 if (!NILP (bg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 if (COLOR_INSTANCEP (bg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 gcv.background = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (bg)).pixel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 gcv.background = XINT (bg);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 mask |= GCBackground;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697
373
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
698 /* This special case comes from a request to draw text with a face which has
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
699 the dim property. We'll use a stippled foreground GC. */
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
700 if (EQ (bg_pmap, Qdim))
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
701 {
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
702 assert (DEVICE_X_GRAY_PIXMAP (d) != None);
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
703
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
704 gcv.fill_style = FillStippled;
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
705 gcv.stipple = DEVICE_X_GRAY_PIXMAP (d);
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
706 mask |= (GCFillStyle | GCStipple);
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
707 }
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
708 else if (IMAGE_INSTANCEP (bg_pmap)
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
709 && IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (bg_pmap)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 if (XIMAGE_INSTANCE_PIXMAP_DEPTH (bg_pmap) == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 gcv.fill_style = FillOpaqueStippled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 gcv.stipple = XIMAGE_INSTANCE_X_PIXMAP (bg_pmap);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 mask |= (GCStipple | GCFillStyle);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719 gcv.fill_style = FillTiled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 gcv.tile = XIMAGE_INSTANCE_X_PIXMAP (bg_pmap);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 mask |= (GCTile | GCFillStyle);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 if (!NILP (lwidth))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727 gcv.line_width = XINT (lwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728 mask |= GCLineWidth;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731 return gc_cache_lookup (DEVICE_X_GC_CACHE (d), &gcv, mask);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 x_output_string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
736
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737 Given a string and a starting position, output that string in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 given face. If cursor is true, draw a cursor around the string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 Correctly handles multiple charsets in the string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741 The meaning of the parameters is something like this:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 W Window that the text is to be displayed in.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744 DL Display line that this text is on. The values in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 structure are used to determine the vertical position and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 clipping range of the text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 BUF Dynamic array of Emchars specifying what is actually to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 drawn.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749 XPOS X position in pixels where the text should start being drawn.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 XOFFSET Number of pixels to be chopped off the left side of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 text. The effect is as if the text were shifted to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752 left this many pixels and clipped at XPOS.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
753 CLIP_START Clip everything left of this X position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754 WIDTH Clip everything right of XPOS + WIDTH.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755 FINDEX Index for the face cache element describing how to display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
756 the text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
757 CURSOR #### I don't understand this. There's something
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
758 strange and overcomplexified with this variable.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
759 Chuck, explain please?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760 CURSOR_START Starting X position of cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761 CURSOR_WIDTH Width of cursor in pixels.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762 CURSOR_HEIGHT Height of cursor in pixels.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764 Starting Y position of cursor is the top of the text line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765 The cursor is drawn sometimes whether or not CURSOR is set. ???
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768 x_output_string (struct window *w, struct display_line *dl,
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
769 Emchar_dynarr *buf, int xpos, int xoffset, int clip_start,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770 int width, face_index findex, int cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771 int cursor_start, int cursor_width, int cursor_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 /* General variables */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775 struct device *d = XDEVICE (f->device);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
776 Lisp_Object device;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
777 Lisp_Object window;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778 Display *dpy = DEVICE_X_DISPLAY (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781 int clip_end;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
782
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 /* Cursor-related variables */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784 int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785 int cursor_clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 Lisp_Object bar_cursor_value = symbol_value_in_buffer (Qbar_cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787 WINDOW_BUFFER (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788 struct face_cachel *cursor_cachel = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 /* Text-related variables */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791 Lisp_Object bg_pmap;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792 GC bgc, gc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793 int height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794 int len = Dynarr_length (buf);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
795 unsigned char *text_storage = (unsigned char *) alloca (2 * len);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
796 struct textual_run *runs = alloca_array (struct textual_run, len);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
797 int nruns;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
799 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
801 XSETDEVICE (device, d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
802 XSETWINDOW (window, w);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
803
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804 if (width < 0)
251
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 247
diff changeset
805 width = x_text_width (f, cachel, Dynarr_atp (buf, 0), Dynarr_length (buf));
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
806 height = dl->ascent + dl->descent - dl->clip;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 /* Regularize the variables passed in. */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
809
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 if (clip_start < xpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 clip_start = xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812 clip_end = xpos + width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813 if (clip_start >= clip_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 /* It's all clipped out. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 xpos -= xoffset;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
818
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 nruns = separate_textual_runs (text_storage, runs, Dynarr_atp (buf, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 Dynarr_length (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822 cursor_clip = (cursor_start >= clip_start &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 cursor_start < clip_end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 /* This cursor code is really a mess. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 if (!NILP (w->text_cursor_visible_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 && (cursor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828 || cursor_clip
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 || (cursor_width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830 && (cursor_start + cursor_width >= clip_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 && !NILP (bar_cursor_value))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833 /* These have to be in separate statements in order to avoid a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834 compiler bug. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 face_index sucks = get_builtin_face_cache_index (w, Vtext_cursor_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 cursor_cachel = WINDOW_FACE_CACHEL (w, sucks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838 /* We have to reset this since any call to WINDOW_FACE_CACHEL
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 may cause the cache to resize and any pointers to it to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 become invalid. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 cachel = WINDOW_FACE_CACHEL (w, findex);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
843
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
844 #ifdef HAVE_XIM
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
845 if (cursor && focus && (cursor_start == clip_start) && cursor_height)
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
846 XIM_SetSpotLocation (f, xpos - 2, dl->ypos + dl->descent - 2);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
847 #endif /* HAVE_XIM */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849 bg_pmap = cachel->background_pixmap;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 if (!IMAGE_INSTANCEP (bg_pmap)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 || !IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (bg_pmap)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 bg_pmap = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854 if ((cursor && focus && NILP (bar_cursor_value)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855 && !NILP (w->text_cursor_visible_p)) || NILP (bg_pmap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856 bgc = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 bgc = x_get_gc (d, Qnil, cachel->foreground, cachel->background,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 bg_pmap, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 if (bgc)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 XFillRectangle (dpy, x_win, bgc, clip_start,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
863 dl->ypos - dl->ascent, clip_end - clip_start,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 height);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
865
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866 for (i = 0; i < nruns; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 Lisp_Object font = FACE_CACHEL_FONT (cachel, runs[i].charset);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
869 struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 int this_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 int need_clipping;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 if (EQ (font, Vthe_null_font_instance))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876 this_width = x_text_width_single_run (cachel, runs + i);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 need_clipping = (dl->clip || clip_start > xpos ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 clip_end < xpos + this_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 /* XDrawImageString only clears the area equal to the height of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 the given font. It is possible that a font is being displayed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 on a line taller than it is, so this would cause us to fail to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 clear some areas. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
884 if ((int) fi->height < (int) (height + dl->clip))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 int clear_start = max (xpos, clip_start);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 int clear_end = min (xpos + this_width, clip_end);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
888
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 if (cursor)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 int ypos1_line, ypos1_string, ypos2_line, ypos2_string;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
892
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 ypos1_string = dl->ypos - fi->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 ypos2_string = dl->ypos + fi->descent;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
895 ypos1_line = dl->ypos - dl->ascent;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
896 ypos2_line = dl->ypos + dl->descent - dl->clip;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
897
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 /* Make sure we don't clear below the real bottom of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 if (ypos1_string > ypos2_line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 ypos1_string = ypos2_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 if (ypos2_string > ypos2_line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
903 ypos2_string = ypos2_line;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
904
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905 if (ypos1_line < ypos1_string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906 {
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
907 redisplay_clear_region (window, findex, clear_start, ypos1_line,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 clear_end - clear_start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 ypos1_string - ypos1_line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
911
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912 if (ypos2_line > ypos2_string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 {
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
914 redisplay_clear_region (window, findex, clear_start, ypos2_string,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 clear_end - clear_start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 ypos2_line - ypos2_string);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 {
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
921 redisplay_clear_region (window, findex, clear_start,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
922 dl->ypos - dl->ascent, clear_end - clear_start,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 if (cursor && cursor_cachel && focus && NILP (bar_cursor_value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 gc = x_get_gc (d, font, cursor_cachel->foreground,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 cursor_cachel->background, Qnil, Qnil);
373
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
930 else if (cachel->dim)
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
931 {
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
932 /* Ensure the gray bitmap exists */
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
933 if (DEVICE_X_GRAY_PIXMAP (d) == None)
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
934 DEVICE_X_GRAY_PIXMAP (d) =
373
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
935 XCreateBitmapFromData (dpy, x_win, (char *)gray_bits,
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
936 gray_width, gray_height);
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
937
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
938 /* Request a GC with the gray stipple pixmap to draw dimmed text */
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
939 gc = x_get_gc (d, font, cachel->foreground, cachel->background,
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
940 Qdim, Qnil);
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
941 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 gc = x_get_gc (d, font, cachel->foreground, cachel->background,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 Qnil, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 if (need_clipping)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 XRectangle clip_box[1];
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
949
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 clip_box[0].x = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951 clip_box[0].y = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952 clip_box[0].width = clip_end - clip_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 clip_box[0].height = height;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
954
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
955 XSetClipRectangles (dpy, gc, clip_start, dl->ypos - dl->ascent,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956 clip_box, 1, Unsorted);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 if (runs[i].dimension == 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960 (bgc ? XDrawString : XDrawImageString) (dpy, x_win, gc, xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 dl->ypos, (char *) runs[i].ptr,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 runs[i].len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964 (bgc ? XDrawString16 : XDrawImageString16) (dpy, x_win, gc, xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 dl->ypos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 (XChar2b *) runs[i].ptr,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 runs[i].len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 /* We draw underlines in the same color as the text. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 if (cachel->underline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 unsigned long upos, uthick;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973 XFontStruct *xfont;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
974
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 xfont = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976 if (!XGetFontProperty (xfont, XA_UNDERLINE_POSITION, &upos))
247
e70b3a057e12 Import from CVS: tag r20-5b22
cvs
parents: 219
diff changeset
977 upos = dl->descent / 2;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978 if (!XGetFontProperty (xfont, XA_UNDERLINE_THICKNESS, &uthick))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 uthick = 1;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
980
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 if (dl->ypos + upos < dl->ypos + dl->descent - dl->clip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 if (dl->ypos + upos + uthick > dl->ypos + dl->descent - dl->clip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 uthick = dl->descent - dl->clip - upos;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
985
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 if (uthick == 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 XDrawLine (dpy, x_win, gc, xpos, dl->ypos + upos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 xpos + this_width, dl->ypos + upos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 else if (uthick > 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 XFillRectangle (dpy, x_win, gc, xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 dl->ypos + upos, this_width, uthick);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
998
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 if (cachel->strikethru) {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000 unsigned long ascent,descent,upos, uthick;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 XFontStruct *xfont;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1002
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 xfont = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font));
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1004
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 if (!XGetFontProperty (xfont, XA_STRIKEOUT_ASCENT, &ascent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006 ascent = xfont->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007 if (!XGetFontProperty (xfont, XA_STRIKEOUT_DESCENT, &descent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 descent = xfont->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 if (!XGetFontProperty (xfont, XA_UNDERLINE_THICKNESS, &uthick))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 uthick = 1;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1011
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 upos = ascent - ((ascent + descent) / 2) + 1;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1013
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014 /* Generally, upos will be positive (above the baseline),so subtract */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 if (dl->ypos - upos < dl->ypos + dl->descent - dl->clip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017 if (dl->ypos - upos + uthick > dl->ypos + dl->descent - dl->clip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 uthick = dl->descent - dl->clip + upos;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1019
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 if (uthick == 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 XDrawLine (dpy, x_win, gc, xpos, dl->ypos - upos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 xpos + this_width, dl->ypos - upos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1025 else if (uthick > 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1026 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027 XFillRectangle (dpy, x_win, gc, xpos, dl->ypos + upos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028 this_width, uthick);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1030 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1032
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1033 /* Restore the GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034 if (need_clipping)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036 XSetClipMask (dpy, gc, None);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1037 XSetClipOrigin (dpy, gc, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1038 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1039
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040 /* If we are actually superimposing the cursor then redraw with just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1041 the appropriate section highlighted. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042 if (cursor_clip && !cursor && focus && cursor_cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 GC cgc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 XRectangle clip_box[1];
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1046
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047 cgc = x_get_gc (d, font, cursor_cachel->foreground,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048 cursor_cachel->background, Qnil, Qnil);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1049
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 clip_box[0].x = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051 clip_box[0].y = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052 clip_box[0].width = cursor_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 clip_box[0].height = height;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1054
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1055 XSetClipRectangles (dpy, cgc, cursor_start, dl->ypos - dl->ascent,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056 clip_box, 1, Unsorted);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1057
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 if (runs[i].dimension == 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059 XDrawImageString (dpy, x_win, cgc, xpos, dl->ypos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060 (char *) runs[i].ptr, runs[i].len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062 XDrawImageString16 (dpy, x_win, cgc, xpos, dl->ypos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1063 (XChar2b *) runs[i].ptr, runs[i].len);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1064
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065 XSetClipMask (dpy, cgc, None);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1066 XSetClipOrigin (dpy, cgc, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1067 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1069 xpos += this_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072 /* Draw the non-focus box or bar-cursor as needed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073 /* Can't this logic be simplified? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074 if (cursor_cachel
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 && ((cursor && !focus && NILP (bar_cursor_value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076 || (cursor_width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077 && (cursor_start + cursor_width >= clip_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078 && !NILP (bar_cursor_value))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080 int tmp_height, tmp_y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081 int bar_width = EQ (bar_cursor_value, Qt) ? 1 : 2;
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1082 int need_clipping = (cursor_start < clip_start
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1083 || clip_end < cursor_start + cursor_width);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 /* #### This value is correct (as far as I know) because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 all of the times we need to draw this cursor, we will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 be called with exactly one character, so we know we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 can always use runs[0].
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 This is bogus as all hell, however. The cursor handling in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1091 this function is way bogus and desperately needs to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092 cleaned up. (In particular, the drawing of the cursor should
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093 really really be separated out of this function. This may be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 a bit tricky now because this function itself does way too
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 much stuff, a lot of which needs to be moved into
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 redisplay.c) This is the only way to be able to easily add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 new cursor types or (e.g.) make the bar cursor be able to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098 span two characters instead of overlaying just one. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099 int bogusly_obtained_ascent_value =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100 XFONT_INSTANCE (FACE_CACHEL_FONT (cachel, runs[0].charset))->ascent;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1101
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102 if (!NILP (bar_cursor_value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104 gc = x_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105 make_int (bar_width));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1106 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1108 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 gc = x_get_gc (d, Qnil, cursor_cachel->background,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110 Qnil, Qnil, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1112
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 tmp_y = dl->ypos - bogusly_obtained_ascent_value;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 tmp_height = cursor_height;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1115 if (tmp_y + tmp_height > (int) (dl->ypos - dl->ascent + height))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1117 tmp_y = dl->ypos - dl->ascent + height - tmp_height;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1118 if (tmp_y < (int) (dl->ypos - dl->ascent))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1119 tmp_y = dl->ypos - dl->ascent;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1120 tmp_height = dl->ypos - dl->ascent + height - tmp_y;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1122
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1123 if (need_clipping)
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1124 {
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1125 XRectangle clip_box[1];
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1126 clip_box[0].x = 0;
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1127 clip_box[0].y = 0;
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1128 clip_box[0].width = clip_end - clip_start;
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1129 clip_box[0].height = tmp_height;
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1130 XSetClipRectangles (dpy, gc, clip_start, tmp_y,
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1131 clip_box, 1, Unsorted);
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1132 }
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1133
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 if (!focus && NILP (bar_cursor_value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135 {
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1136 XDrawRectangle (dpy, x_win, gc, cursor_start, tmp_y,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137 cursor_width - 1, tmp_height - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139 else if (focus && !NILP (bar_cursor_value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140 {
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1141 XDrawLine (dpy, x_win, gc, cursor_start + bar_width - 1, tmp_y,
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1142 cursor_start + bar_width - 1, tmp_y + tmp_height - 1);
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1143 }
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1144
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1145 /* Restore the GC */
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1146 if (need_clipping)
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1147 {
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1148 XSetClipMask (dpy, gc, None);
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1149 XSetClipOrigin (dpy, gc, 0, 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154 void
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1155 x_output_x_pixmap (struct frame *f, struct Lisp_Image_Instance *p, int x,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1156 int y, int clip_x, int clip_y, int clip_width,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1157 int clip_height, int width, int height, int pixmap_offset,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1158 unsigned long fg, unsigned long bg, GC override_gc)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161 Display *dpy = DEVICE_X_DISPLAY (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164 GC gc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 XGCValues gcv;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166 unsigned long pixmap_mask;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1167 int need_clipping = (clip_x || clip_y);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169 if (!override_gc)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171 memset (&gcv, ~0, sizeof (XGCValues));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172 gcv.graphics_exposures = False;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173 gcv.foreground = fg;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174 gcv.background = bg;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175 pixmap_mask = GCForeground | GCBackground | GCGraphicsExposures;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177 if (IMAGE_INSTANCE_X_MASK (p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179 gcv.function = GXcopy;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180 gcv.clip_mask = IMAGE_INSTANCE_X_MASK (p);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1181 gcv.clip_x_origin = x;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1182 gcv.clip_y_origin = y - pixmap_offset;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1183 pixmap_mask |= (GCFunction | GCClipMask | GCClipXOrigin |
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184 GCClipYOrigin);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1185 /* Can't set a clip rectangle below because we already have a mask.
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1186 We could conceivably create a new clipmask by zeroing out
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1187 everything outside the clip region. Is it worth it?
112
48d667d6f17f Import from CVS: tag r20-1b8
cvs
parents: 70
diff changeset
1188 Is it possible to get an equivalent effect by changing the
48d667d6f17f Import from CVS: tag r20-1b8
cvs
parents: 70
diff changeset
1189 args to XCopyArea below rather than messing with a clip box?
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1190 - dkindred@cs.cmu.edu */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1191 need_clipping = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194 gc = gc_cache_lookup (DEVICE_X_GC_CACHE (d), &gcv, pixmap_mask);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196 else
112
48d667d6f17f Import from CVS: tag r20-1b8
cvs
parents: 70
diff changeset
1197 {
48d667d6f17f Import from CVS: tag r20-1b8
cvs
parents: 70
diff changeset
1198 gc = override_gc;
48d667d6f17f Import from CVS: tag r20-1b8
cvs
parents: 70
diff changeset
1199 /* override_gc might have a mask already--we don't want to nuke it.
48d667d6f17f Import from CVS: tag r20-1b8
cvs
parents: 70
diff changeset
1200 Maybe we can insist that override_gc have no mask, or use
48d667d6f17f Import from CVS: tag r20-1b8
cvs
parents: 70
diff changeset
1201 one of the suggestions above. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1202 need_clipping = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1203 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1204
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1205 if (need_clipping)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1206 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1207 XRectangle clip_box[1];
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1208
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1209 clip_box[0].x = clip_x;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1210 clip_box[0].y = clip_y;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1211 clip_box[0].width = clip_width;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1212 clip_box[0].height = clip_height;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1213
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1214 XSetClipRectangles (dpy, gc, x, y, clip_box, 1, Unsorted);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 /* depth of 0 means it's a bitmap, not a pixmap, and we should use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218 XCopyPlane (1 = current foreground color, 0 = background) instead
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 of XCopyArea, which means that the bits in the pixmap are actual
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220 pixel values, instead of symbolic of fg/bg. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221 if (IMAGE_INSTANCE_PIXMAP_DEPTH (p) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1223 XCopyArea (dpy, IMAGE_INSTANCE_X_PIXMAP (p), x_win, gc, 0,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1224 pixmap_offset, width,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 height, x, y);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1226 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1229 XCopyPlane (dpy, IMAGE_INSTANCE_X_PIXMAP (p), x_win, gc, 0,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1230 (pixmap_offset < 0
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1231 ? 0
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1232 : pixmap_offset),
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1233 width, height, x,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1234 (pixmap_offset < 0
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1235 ? y - pixmap_offset
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1236 : y),
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1237 1L);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1238 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1239
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1240 if (need_clipping)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1241 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1242 XSetClipMask (dpy, gc, None);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1243 XSetClipOrigin (dpy, gc, 0, 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1244 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247 static void
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1248 x_output_pixmap (struct window *w, struct display_line *dl,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1249 Lisp_Object image_instance, int xpos, int xoffset,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1250 int start_pixpos, int width, face_index findex,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1251 int cursor_start, int cursor_width, int cursor_height)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1252 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254 struct device *d = XDEVICE (f->device);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1255 struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1256 Lisp_Object window;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258 Display *dpy = DEVICE_X_DISPLAY (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259 Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f));
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1260 int lheight = dl->ascent + dl->descent - dl->clip;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1261 int pheight = ((int) IMAGE_INSTANCE_PIXMAP_HEIGHT (p) > lheight ? lheight :
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1262 IMAGE_INSTANCE_PIXMAP_HEIGHT (p));
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1263 int pwidth = min (width + xoffset, (int) IMAGE_INSTANCE_PIXMAP_WIDTH (p));
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1264 int clip_x, clip_y, clip_width, clip_height;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1265
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1266 /* The pixmap_offset is used to center the pixmap on lines which are
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1267 shorter than it is. This results in odd effects when scrolling
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1268 pixmaps off of the bottom. Let's try not using it. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1269 #if 0
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1270 int pixmap_offset = (int) (IMAGE_INSTANCE_PIXMAP_HEIGHT (p) - lheight) / 2;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1271 #else
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1272 int pixmap_offset = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1273 #endif
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1274
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1275 XSETWINDOW (window, w);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1276
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1277 if ((start_pixpos >= 0 && start_pixpos > xpos) || xoffset)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1278 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1279 if (start_pixpos > xpos && start_pixpos > xpos + width)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1280 return;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1281
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1282 clip_x = xoffset;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1283 clip_width = width;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1284 if (start_pixpos > xpos)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1285 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1286 clip_x += (start_pixpos - xpos);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1287 clip_width -= (start_pixpos - xpos);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1288 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1289 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1290 else
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1291 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1292 clip_x = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1293 clip_width = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1294 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1295
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1296 /* Place markers for possible future functionality (clipping the top
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1297 half instead of the bottom half; think pixel scrolling). */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1298 clip_y = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1299 clip_height = pheight;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1300
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1301 /* Clear the area the pixmap is going into. The pixmap itself will
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1302 always take care of the full width. We don't want to clear where
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1303 it is going to go in order to avoid flicker. So, all we have to
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1304 take care of is any area above or below the pixmap. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1305 /* #### We take a shortcut for now. We know that since we have
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1306 pixmap_offset hardwired to 0 that the pixmap is against the top
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1307 edge so all we have to worry about is below it. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1308 /* #### Unless the pixmap has a mask in which case we have to clear
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1309 the whole damn thing since we can't yet clear just the area not
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1310 included in the mask. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1311 if (((int) (dl->ypos - dl->ascent + pheight) <
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1312 (int) (dl->ypos + dl->descent - dl->clip))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1313 || IMAGE_INSTANCE_X_MASK (p))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1314 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1315 int clear_x, clear_y, clear_width, clear_height;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1316
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1317 if (IMAGE_INSTANCE_X_MASK (p))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1318 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1319 clear_y = dl->ypos - dl->ascent;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1320 clear_height = lheight;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1321 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1322 else
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1323 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1324 clear_y = dl->ypos - dl->ascent + pheight;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1325 clear_height = lheight - pheight;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1326 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1327
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1328 if (start_pixpos >= 0 && start_pixpos > xpos)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1329 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1330 clear_x = start_pixpos;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1331 clear_width = xpos + width - start_pixpos;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1332 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1333 else
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1334 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1335 clear_x = xpos;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1336 clear_width = width;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1337 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1338
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1339 redisplay_clear_region (window, findex, clear_x, clear_y,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1340 clear_width, clear_height);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1341 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1342
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1343 /* Output the pixmap. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1344 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1345 Lisp_Object tmp_pixel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1346 XColor tmp_bcolor, tmp_fcolor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1347
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1348 tmp_pixel = WINDOW_FACE_CACHEL_FOREGROUND (w, findex);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1349 tmp_fcolor = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1350 tmp_pixel = WINDOW_FACE_CACHEL_BACKGROUND (w, findex);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 tmp_bcolor = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1353 x_output_x_pixmap (f, p, xpos - xoffset, dl->ypos - dl->ascent, clip_x,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1354 clip_y, clip_width, clip_height,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1355 pwidth, pheight, pixmap_offset,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356 tmp_fcolor.pixel, tmp_bcolor.pixel, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 /* Draw a cursor over top of the pixmap. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1360 if (cursor_width && cursor_height && (cursor_start >= xpos)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 && !NILP (w->text_cursor_visible_p)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1362 && (cursor_start < xpos + pwidth))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364 GC gc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365 int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d));
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1366 int y = dl->ypos - dl->ascent;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367 struct face_cachel *cursor_cachel =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368 WINDOW_FACE_CACHEL (w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369 get_builtin_face_cache_index
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1370 (w, Vtext_cursor_face));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372 gc = x_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1374 if (cursor_width > xpos + pwidth - cursor_start)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1375 cursor_width = xpos + pwidth - cursor_start;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1377 if (focus)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1378 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1379 XFillRectangle (dpy, x_win, gc, cursor_start, y, cursor_width,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380 cursor_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1381 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1383 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1384 XDrawRectangle (dpy, x_win, gc, cursor_start, y, cursor_width,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1385 cursor_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1388 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1389
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1390 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1391 x_output_vertical_divider
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1392
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1393 Draw a vertical divider down the right side of the given window.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1394 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1395 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1396 x_output_vertical_divider (struct window *w, int clear)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1397 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1398 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1399 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401 Display *dpy = DEVICE_X_DISPLAY (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1402 Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f));
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1403 Lisp_Object tmp_pixel;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1404 XColor tmp_color;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1405 XGCValues gcv;
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
1406 GC background_gc;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1408 unsigned long mask;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1409 int x, y1, y2, width, shadow_thickness, spacing, line_width;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1410 face_index div_face = get_builtin_face_cache_index (w, Vvertical_divider_face);
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
1411
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1412 width = window_divider_width (w);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1413 shadow_thickness = XINT (w->vertical_divider_shadow_thickness);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1414 spacing = XINT (w->vertical_divider_spacing);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1415 line_width = XINT (w->vertical_divider_line_width);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1416 x = WINDOW_RIGHT (w) - width;
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
1417 y1 = WINDOW_TOP (w) + FRAME_TOP_GUTTER_BOUNDS (f);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
1418 y2 = WINDOW_BOTTOM (w) + FRAME_BOTTOM_GUTTER_BOUNDS (f);
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
1419
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1420 memset (&gcv, ~0, sizeof (XGCValues));
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
1421
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1422 tmp_pixel = WINDOW_FACE_CACHEL_BACKGROUND (w, div_face);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1423 tmp_color = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel));
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
1424
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1425 /* First, get the GC's. */
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1426 gcv.background = tmp_color.pixel;
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
1427 gcv.foreground = tmp_color.pixel;
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1428 gcv.graphics_exposures = False;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1429 mask = GCForeground | GCBackground | GCGraphicsExposures;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1430 background_gc = gc_cache_lookup (DEVICE_X_GC_CACHE (d), &gcv, mask);
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
1431
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1432 /* Clear the divider area first. This needs to be done when a
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1433 window split occurs. */
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1434 if (clear)
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1435 XClearArea (dpy, x_win, x, y1, width, y2 - y1, False);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1437 /* Draw the divider line. */
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
1438 XFillRectangle (dpy, x_win, background_gc,
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1439 x + spacing + shadow_thickness, y1,
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1440 line_width, y2 - y1);
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
1441
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
1442 /* Draw the shadows around the divider line */
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
1443 x_bevel_area (w, div_face, x + spacing, y1,
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
1444 width - 2 * spacing, y2 - y1,
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
1445 shadow_thickness);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1447
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1448 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1449 x_output_blank
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1451 Output a blank by clearing the area it covers in the foreground color
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452 of its face.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1454 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1455 x_output_blank (struct window *w, struct display_line *dl, struct rune *rb,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1456 int start_pixpos, int cursor_start, int cursor_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1460
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1461 Display *dpy = DEVICE_X_DISPLAY (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1462 Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1463 GC gc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1464 struct face_cachel *cursor_cachel =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1465 WINDOW_FACE_CACHEL (w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1466 get_builtin_face_cache_index
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1467 (w, Vtext_cursor_face));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1468 Lisp_Object bg_pmap;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469 Lisp_Object buffer = WINDOW_BUFFER (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470 Lisp_Object bar_cursor_value = symbol_value_in_buffer (Qbar_cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471 buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1472
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1473 int x = rb->xpos;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1474 int y = dl->ypos - dl->ascent;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1475 int width = rb->width;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1476 int height = dl->ascent + dl->descent - dl->clip;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1478 if (start_pixpos > x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1480 if (start_pixpos >= (x + width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1481 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1484 width -= (start_pixpos - x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1485 x = start_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1486 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1487 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1488
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1489 bg_pmap = WINDOW_FACE_CACHEL_BACKGROUND_PIXMAP (w, rb->findex);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1490 if (!IMAGE_INSTANCEP (bg_pmap)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1491 || !IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (bg_pmap)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1492 bg_pmap = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1493
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1494 if (NILP (bg_pmap))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1495 gc = x_get_gc (d, Qnil, WINDOW_FACE_CACHEL_BACKGROUND (w, rb->findex),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1496 Qnil, Qnil, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1497 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1498 gc = x_get_gc (d, Qnil, WINDOW_FACE_CACHEL_FOREGROUND (w, rb->findex),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1499 WINDOW_FACE_CACHEL_BACKGROUND (w, rb->findex), bg_pmap,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1500 Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1502 XFillRectangle (dpy, x_win, gc, x, y, width, height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1503
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504 /* If this rune is marked as having the cursor, then it is actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505 representing a tab. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506 if (!NILP (w->text_cursor_visible_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507 && (rb->cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508 || (cursor_width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 && (cursor_start + cursor_width > x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 && cursor_start < (x + width))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512 int cursor_height, cursor_y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513 int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d));
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1514 struct Lisp_Font_Instance *fi;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1515
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516 fi = XFONT_INSTANCE (FACE_CACHEL_FONT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1517 (WINDOW_FACE_CACHEL (w, rb->findex),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1518 Vcharset_ascii));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1519
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520 gc = x_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522 cursor_y = dl->ypos - fi->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523 cursor_height = fi->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524 if (cursor_y + cursor_height > y + height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1525 cursor_height = y + height - cursor_y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1526
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527 if (focus)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1529 if (NILP (bar_cursor_value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1530 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1531 XFillRectangle (dpy, x_win, gc, cursor_start, cursor_y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532 fi->width, cursor_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1534 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536 int bar_width = EQ (bar_cursor_value, Qt) ? 1 : 2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1537
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1538 gc = x_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539 make_int (bar_width));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540 XDrawLine (dpy, x_win, gc, cursor_start + bar_width - 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541 cursor_y, cursor_start + bar_width - 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1542 cursor_y + cursor_height - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1543 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1544 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1545 else if (NILP (bar_cursor_value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1546 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1547 XDrawRectangle (dpy, x_win, gc, cursor_start, cursor_y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1548 fi->width - 1, cursor_height - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1549 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1552
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554 x_output_hline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556 Output a horizontal line in the foreground of its face.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1558 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1559 x_output_hline (struct window *w, struct display_line *dl, struct rune *rb)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1560 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1564 Display *dpy = DEVICE_X_DISPLAY (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1565 Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1566 GC gc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1567
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1568 int x = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1569 int width = rb->width;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1570 int height = dl->ascent + dl->descent - dl->clip;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1571 int ypos1, ypos2, ypos3, ypos4;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1572
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1573 ypos1 = dl->ypos - dl->ascent;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1574 ypos2 = ypos1 + rb->object.hline.yoffset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1575 ypos3 = ypos2 + rb->object.hline.thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1576 ypos4 = dl->ypos + dl->descent - dl->clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1577
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1578 /* First clear the area not covered by the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1579 if (height - rb->object.hline.thickness > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1580 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581 gc = x_get_gc (d, Qnil, WINDOW_FACE_CACHEL_FOREGROUND (w, rb->findex),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1582 Qnil, Qnil, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1583
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1584 if (ypos2 - ypos1 > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1585 XFillRectangle (dpy, x_win, gc, x, ypos1, width, ypos2 - ypos1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1586 if (ypos4 - ypos3 > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1587 XFillRectangle (dpy, x_win, gc, x, ypos1, width, ypos2 - ypos1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1588 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1589
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1590 /* Now draw the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1591 gc = x_get_gc (d, Qnil, WINDOW_FACE_CACHEL_BACKGROUND (w, rb->findex),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1592 Qnil, Qnil, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1593
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1594 if (ypos2 < ypos1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1595 ypos2 = ypos1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1596 if (ypos3 > ypos4)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1597 ypos3 = ypos4;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1598
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1599 if (ypos3 - ypos2 > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1600 XFillRectangle (dpy, x_win, gc, x, ypos2, width, ypos3 - ypos2);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1601 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1602
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1603 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1604 x_output_shadows
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1605
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1606 Draw a shadow around the given area using the given GC's. It is the
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
1607 callers responsibility to set the GC's appropriately.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1608 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1609 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1610 x_output_shadows (struct frame *f, int x, int y, int width, int height,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1611 GC top_shadow_gc, GC bottom_shadow_gc, GC background_gc,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1612 int shadow_thickness)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1613 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1614 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1615
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1616 Display *dpy = DEVICE_X_DISPLAY (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1617 Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1618
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1619 XSegment top_shadow[20], bottom_shadow[20];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1620 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1621
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1622 if (shadow_thickness > 10)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1623 shadow_thickness = 10;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1624 else if (shadow_thickness < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1625 shadow_thickness = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1626 if (shadow_thickness > (width / 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1627 shadow_thickness = width / 2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1628 if (shadow_thickness > (height / 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1629 shadow_thickness = height / 2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1630
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1631 for (elt = 0; elt < shadow_thickness; elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1632 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1633 int seg1 = elt;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1634 int seg2 = elt + shadow_thickness;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1635
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1636 top_shadow[seg1].x1 = x;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1637 top_shadow[seg1].x2 = x + width - elt - 1;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1638 top_shadow[seg1].y1 = top_shadow[seg1].y2 = y + elt;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1639
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1640 top_shadow[seg2].x1 = top_shadow[seg2].x2 = x + elt;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1641 top_shadow[seg2].y1 = y + shadow_thickness;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1642 top_shadow[seg2].y2 = y + height - elt - 1;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1643
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1644 bottom_shadow[seg1].x1 = x + elt + 1;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1645 bottom_shadow[seg1].x2 = x + width - 1;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1646 bottom_shadow[seg1].y1 = bottom_shadow[seg1].y2 = y + height - elt - 1;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1647
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1648 bottom_shadow[seg2].x1 = bottom_shadow[seg2].x2 = x + width - elt - 1;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1649 bottom_shadow[seg2].y1 = y + elt + 1;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1650 bottom_shadow[seg2].y2 = y + height - shadow_thickness;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1651 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1652
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1653 XDrawSegments (dpy, x_win, top_shadow_gc, top_shadow, shadow_thickness * 2);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1654 XDrawSegments (dpy, x_win, bottom_shadow_gc, bottom_shadow,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1655 shadow_thickness * 2);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1656 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1657
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1658 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1659 x_generate_shadow_pixels
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1660
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1661 Given three pixels (top shadow, bottom shadow, background) massage
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1662 the top and bottom shadow colors to guarantee that they differ. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1663 background pixels are not allowed to be modified.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1664
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1665 This function modifies its parameters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1666
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1667 This code is modified from code blatantly stolen from lwlib/xlwmenu.c
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1668 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1669 #define MINL(x,y) ((((unsigned long) (x)) < ((unsigned long) (y))) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1670 ? ((unsigned long) (x)) : ((unsigned long) (y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1671
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1672 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1673 x_generate_shadow_pixels (struct frame *f, unsigned long *top_shadow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1674 unsigned long *bottom_shadow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1675 unsigned long background,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1676 unsigned long core_background)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1677 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1678 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1679 Display *dpy = DEVICE_X_DISPLAY (d);
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 217
diff changeset
1680 Colormap cmap = DEVICE_X_COLORMAP (d);
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 217
diff changeset
1681 Visual *visual = DEVICE_X_VISUAL (d);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1682
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1683 XColor topc, botc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1684 int top_frobbed = 0, bottom_frobbed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1685
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1686 /* If the top shadow is the same color as the background, try to
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1687 adjust it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1688 if (*top_shadow == background)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1689 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1690 topc.pixel = background;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1691 XQueryColor (dpy, cmap, &topc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1692 /* don't overflow/wrap! */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1693 topc.red = MINL (65535, (unsigned long) topc.red * 6 / 5);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1694 topc.green = MINL (65535, (unsigned long) topc.green * 6 / 5);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1695 topc.blue = MINL (65535, (unsigned long) topc.blue * 6 / 5);
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 217
diff changeset
1696 if (allocate_nearest_color (dpy, cmap, visual, &topc))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1697 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1698 *top_shadow = topc.pixel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1699 top_frobbed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1700 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1701 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1702
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1703 /* If the bottom shadow is the same color as the background, try to
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1704 adjust it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1705 if (*bottom_shadow == background)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1706 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1707 botc.pixel = background;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1708 XQueryColor (dpy, cmap, &botc);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1709 botc.red = (unsigned short) ((unsigned long) botc.red * 3 / 5);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1710 botc.green = (unsigned short) ((unsigned long) botc.green * 3 / 5);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1711 botc.blue = (unsigned short) ((unsigned long) botc.blue * 3 / 5);
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 217
diff changeset
1712 if (allocate_nearest_color (dpy, cmap, visual, &botc))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1713 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1714 *bottom_shadow = botc.pixel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1715 bottom_frobbed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1716 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1717 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1718
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1719 /* If we had to adjust both shadows, then we have to do some
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1720 additional work. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1721 if (top_frobbed && bottom_frobbed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1722 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1723 int top_avg = ((topc.red / 3) + (topc.green / 3) + (topc.blue / 3));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1724 int bot_avg = ((botc.red / 3) + (botc.green / 3) + (botc.blue / 3));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1725 if (bot_avg > top_avg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1726 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1727 Pixel tmp = *top_shadow;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1728
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1729 *top_shadow = *bottom_shadow;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1730 *bottom_shadow = tmp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1731 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1732 else if (topc.pixel == botc.pixel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1733 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1734 if (botc.pixel == background)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1735 *top_shadow = core_background;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1736 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1737 *bottom_shadow = background;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1738 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1739 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1740 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1741
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1742 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1743 x_redraw_exposed_window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1744
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1745 Given a bounding box for an area that needs to be redrawn, determine
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1746 what parts of what lines are contained within and re-output their
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1747 contents.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1748 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1749 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1750 x_redraw_exposed_window (struct window *w, int x, int y, int width, int height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1751 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1752 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1753 int line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1754 int start_x, start_y, end_x, end_y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1755 int orig_windows_structure_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1756
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1757 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1758
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1759 if (!NILP (w->vchild))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1760 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1761 x_redraw_exposed_windows (w->vchild, x, y, width, height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1762 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1763 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1764 else if (!NILP (w->hchild))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1765 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1766 x_redraw_exposed_windows (w->hchild, x, y, width, height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1767 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1768 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1769
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1770 /* If the window doesn't intersect the exposed region, we're done here. */
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1771 if (x >= WINDOW_RIGHT (w) || (x + width) <= WINDOW_LEFT (w)
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1772 || y >= WINDOW_BOTTOM (w) || (y + height) <= WINDOW_TOP (w))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1773 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1774 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1775 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1776 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1777 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1778 start_x = max (WINDOW_LEFT (w), x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1779 end_x = min (WINDOW_RIGHT (w), (x + width));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1780 start_y = max (WINDOW_TOP (w), y);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1781 end_y = min (WINDOW_BOTTOM (w), y + height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1782
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1783 /* We do this to make sure that the 3D modelines get redrawn if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1784 they are in the exposed region. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1785 orig_windows_structure_changed = f->windows_structure_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1786 f->windows_structure_changed = 1;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1787 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1788
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1789 if (window_needs_vertical_divider (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1790 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1791 x_output_vertical_divider (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1792 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1793
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1794 for (line = 0; line < Dynarr_length (cdla); line++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1795 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1796 struct display_line *cdl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1797 int top_y = cdl->ypos - cdl->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1798 int bottom_y = cdl->ypos + cdl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800 if (bottom_y >= start_y)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802 if (top_y > end_y)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1803 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1804 if (line == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1805 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1806 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1807 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1808 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1809 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1810 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1811 output_display_line (w, 0, cdla, line, start_x, end_x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1812 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1813 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1814 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1815
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1816 f->windows_structure_changed = orig_windows_structure_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1817
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1818 /* If there have never been any face cache_elements created, then this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1819 expose event doesn't actually have anything to do. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1820 if (Dynarr_largest (w->face_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1821 redisplay_clear_bottom_of_window (w, cdla, start_y, end_y);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1822 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1823
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1824 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1825 x_redraw_exposed_windows
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1826
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1827 For each window beneath the given window in the window hierarchy,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1828 ensure that it is redrawn if necessary after an Expose event.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1829 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1830 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1831 x_redraw_exposed_windows (Lisp_Object window, int x, int y, int width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1832 int height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1833 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1834 for (; !NILP (window); window = XWINDOW (window)->next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1835 x_redraw_exposed_window (XWINDOW (window), x, y, width, height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1836 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1837
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1838 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1839 x_redraw_exposed_area
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1840
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1841 For each window on the given frame, ensure that any area in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1842 Exposed area is redrawn.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1843 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1844 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1845 x_redraw_exposed_area (struct frame *f, int x, int y, int width, int height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1846 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1847 /* If any window on the frame has had its face cache reset then the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1848 redisplay structures are effectively invalid. If we attempt to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1849 use them we'll blow up. We mark the frame as changed to ensure
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1850 that redisplay will do a full update. This probably isn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1851 necessary but it can't hurt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1852
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1853 #ifdef HAVE_TOOLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1854 /* #### We would rather put these off as well but there is currently
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1855 no combination of flags which will force an unchanged toolbar to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1856 redraw anyhow. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1857 MAYBE_FRAMEMETH (f, redraw_exposed_toolbars, (f, x, y, width, height));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1858 #endif
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
1859 redraw_exposed_gutters (f, x, y, width, height);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1860
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861 if (!f->window_face_cache_reset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1862 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1863 x_redraw_exposed_windows (f->root_window, x, y, width, height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1865 XFlush (DEVICE_X_DISPLAY (XDEVICE (f->device)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1866 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1867 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1868 MARK_FRAME_CHANGED (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1869 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1870
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1871 /****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1872 x_clear_region
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1873
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1874 Clear the area in the box defined by the given parameters using the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1875 given face.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1876 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1877 static void
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1878 x_clear_region (Lisp_Object locale, struct device* d, struct frame* f, face_index findex,
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1879 int x, int y,
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1880 int width, int height, Lisp_Object fcolor, Lisp_Object bcolor,
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1881 Lisp_Object background_pixmap)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1882 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1883 Display *dpy;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1884 Window x_win;
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1885 GC gc = NULL;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1886
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1887 dpy = DEVICE_X_DISPLAY (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1888 x_win = XtWindow (FRAME_X_TEXT_WIDGET (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1889
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1890 if (!UNBOUNDP (background_pixmap))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1891 {
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1892 gc = x_get_gc (d, Qnil, fcolor, bcolor, background_pixmap, Qnil);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1893 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1894
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1895 if (gc)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1896 XFillRectangle (dpy, x_win, gc, x, y, width, height);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1897 else
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1898 XClearArea (dpy, x_win, x, y, width, height, False);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1899 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1900
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1901 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1902 x_output_eol_cursor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1903
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1904 Draw a cursor at the end of a line. The end-of-line cursor is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1905 narrower than the normal cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1906 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1907 static void
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 259
diff changeset
1908 x_output_eol_cursor (struct window *w, struct display_line *dl, int xpos,
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 259
diff changeset
1909 face_index findex)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1910 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1911 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1912 struct device *d = XDEVICE (f->device);
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 259
diff changeset
1913 Lisp_Object window;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1914
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1915 Display *dpy = DEVICE_X_DISPLAY (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1916 Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1917 GC gc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1918 face_index elt = get_builtin_face_cache_index (w, Vtext_cursor_face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1919 struct face_cachel *cursor_cachel = WINDOW_FACE_CACHEL (w, elt);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1920
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1921 int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1922 Lisp_Object bar_cursor_value = symbol_value_in_buffer (Qbar_cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1923 WINDOW_BUFFER (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1924
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1925 int x = xpos;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1926 int y = dl->ypos - dl->ascent;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1927 int width = EOL_CURSOR_WIDTH;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1928 int height = dl->ascent + dl->descent - dl->clip;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1929 int cursor_height, cursor_y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1930 int defheight, defascent;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1931
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 259
diff changeset
1932 XSETWINDOW (window, w);
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1933 redisplay_clear_region (window, findex, x, y, width, height);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1934
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1935 if (NILP (w->text_cursor_visible_p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1936 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1937
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1938 gc = x_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1939
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1940 default_face_font_info (window, &defascent, 0, &defheight, 0, 0);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1941
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1942 /* make sure the cursor is entirely contained between y and y+height */
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1943 cursor_height = min (defheight, height);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1944 cursor_y = max (y, min (y + height - cursor_height,
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 112
diff changeset
1945 dl->ypos - defascent));
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1946
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1947 if (focus)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1948 {
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
1949 #ifdef HAVE_XIM
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
1950 XIM_SetSpotLocation (f, x - 2 , cursor_y + cursor_height - 2);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 42
diff changeset
1951 #endif /* HAVE_XIM */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
1952
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1953 if (NILP (bar_cursor_value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1954 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1955 XFillRectangle (dpy, x_win, gc, x, cursor_y, width, cursor_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1956 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1957 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1958 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1959 int bar_width = EQ (bar_cursor_value, Qt) ? 1 : 2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1960
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1961 gc = x_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1962 make_int (bar_width));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1963 XDrawLine (dpy, x_win, gc, x + bar_width - 1, cursor_y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1964 x + bar_width - 1, cursor_y + cursor_height - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1965 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1966 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1967 else if (NILP (bar_cursor_value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1968 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1969 XDrawRectangle (dpy, x_win, gc, x, cursor_y, width - 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1970 cursor_height - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1971 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1972 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1973
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1974 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1975 x_clear_frame_window (Lisp_Object window)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1976 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1977 struct window *w = XWINDOW (window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1978
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1979 if (!NILP (w->vchild))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1980 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1981 x_clear_frame_windows (w->vchild);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1982 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1983 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1984
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1985 if (!NILP (w->hchild))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1986 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1987 x_clear_frame_windows (w->hchild);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1988 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1989 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1990
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
1991 redisplay_clear_to_window_end (w, WINDOW_TEXT_TOP (w),
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
1992 WINDOW_TEXT_BOTTOM (w));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1993 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1994
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1995 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1996 x_clear_frame_windows (Lisp_Object window)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1997 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1998 for (; !NILP (window); window = XWINDOW (window)->next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1999 x_clear_frame_window (window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2000 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2001
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2002 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2003 x_clear_frame (struct frame *f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2004 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2005 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2006 Display *dpy = DEVICE_X_DISPLAY (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2007 Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2008 int x, y, width, height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2009 Lisp_Object frame;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2011 x = FRAME_LEFT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2012 width = (FRAME_PIXWIDTH (f) - FRAME_REAL_LEFT_TOOLBAR_WIDTH (f) -
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
2013 FRAME_REAL_RIGHT_TOOLBAR_WIDTH (f) -
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
2014 2 * FRAME_REAL_LEFT_TOOLBAR_BORDER_WIDTH (f) -
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
2015 2 * FRAME_REAL_RIGHT_TOOLBAR_BORDER_WIDTH (f));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2016 /* #### This adjustment by 1 should be being done in the macros.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2017 There is some small differences between when the menubar is on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2018 and off that we still need to deal with. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2019 y = FRAME_TOP_BORDER_START (f) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2020 height = (FRAME_PIXHEIGHT (f) - FRAME_REAL_TOP_TOOLBAR_HEIGHT (f) -
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
2021 FRAME_REAL_BOTTOM_TOOLBAR_HEIGHT (f) -
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
2022 2 * FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH (f) -
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
2023 2 * FRAME_REAL_BOTTOM_TOOLBAR_BORDER_WIDTH (f)) + 1;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2024
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2025 XClearArea (dpy, x_win, x, y, width, height, False);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2026
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2027 XSETFRAME (frame, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2028
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2029 if (!UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vdefault_face, frame))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2030 || !UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vleft_margin_face, frame))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2031 || !UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vright_margin_face, frame)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2032 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2033 x_clear_frame_windows (f->root_window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2034 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2035
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2036 XFlush (DEVICE_X_DISPLAY (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2037 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2038
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2039 /* briefly swap the foreground and background colors.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2040 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2041
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2042 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2043 x_flash (struct device *d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2044 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2045 Display *dpy;
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2046 Window win;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2047 XGCValues gcv;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2048 GC gc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2049 XColor tmp_fcolor, tmp_bcolor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2050 Lisp_Object tmp_pixel, frame;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2051 struct frame *f = device_selected_frame (d);
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2052 struct window *w = XWINDOW (FRAME_ROOT_WINDOW (f));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2053 Widget shell = FRAME_X_SHELL_WIDGET (f);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
2054
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2055 XSETFRAME (frame, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2056
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2057 tmp_pixel = FACE_FOREGROUND (Vdefault_face, frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2058 tmp_fcolor = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2059 tmp_pixel = FACE_BACKGROUND (Vdefault_face, frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2060 tmp_bcolor = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2061
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2062 dpy = XtDisplay (shell);
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2063 win = XtWindow (FRAME_X_TEXT_WIDGET (f));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2064 memset (&gcv, ~0, sizeof (XGCValues)); /* initialize all slots to ~0 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2065 gcv.foreground = (tmp_fcolor.pixel ^ tmp_bcolor.pixel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2066 gcv.function = GXxor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2067 gcv.graphics_exposures = False;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2068 gc = gc_cache_lookup (DEVICE_X_GC_CACHE (XDEVICE (f->device)), &gcv,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2069 (GCForeground | GCFunction | GCGraphicsExposures));
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2070 XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2071 w->pixel_width, w->pixel_height);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2072 XSync (dpy, False);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2073
197
acd284d43ca1 Import from CVS: tag r20-3b25
cvs
parents: 185
diff changeset
2074 #ifdef HAVE_SELECT
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2075 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2076 int usecs = 100000;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2077 struct timeval tv;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2078 tv.tv_sec = usecs / 1000000L;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2079 tv.tv_usec = usecs % 1000000L;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2080 /* I'm sure someone is going to complain about this... */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 173
diff changeset
2081 select (0, 0, 0, 0, &tv);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2082 }
197
acd284d43ca1 Import from CVS: tag r20-3b25
cvs
parents: 185
diff changeset
2083 #else
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 314
diff changeset
2084 #ifdef HAVE_POLL
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 314
diff changeset
2085 poll (0, 0, 100);
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 314
diff changeset
2086 #else /* !HAVE_POLL */
197
acd284d43ca1 Import from CVS: tag r20-3b25
cvs
parents: 185
diff changeset
2087 bite me
acd284d43ca1 Import from CVS: tag r20-3b25
cvs
parents: 185
diff changeset
2088 #endif /* HAVE_POLL */
acd284d43ca1 Import from CVS: tag r20-3b25
cvs
parents: 185
diff changeset
2089 #endif /* HAVE_SELECT */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2090
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2091 XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2092 w->pixel_width, w->pixel_height);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2093 XSync (dpy, False);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2094
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2095 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2096 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2097
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2098 /* Make audible bell. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2099
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2100 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2101 x_ring_bell (struct device *d, int volume, int pitch, int duration)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2102 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2103 Display *display = DEVICE_X_DISPLAY (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2104
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2105 if (volume < 0) volume = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2106 else if (volume > 100) volume = 100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2107 if (pitch < 0 && duration < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2108 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2109 XBell (display, (volume * 2) - 100);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2110 XFlush (display);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2111 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2112 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2113 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2114 XKeyboardState state;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2115 XKeyboardControl ctl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2116 XSync (display, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2117 /* #### grab server? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2118 XGetKeyboardControl (display, &state);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2119
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2120 ctl.bell_pitch = (pitch >= 0 ? pitch : state.bell_pitch);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2121 ctl.bell_duration = (duration >= 0 ? duration : state.bell_duration);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2122 XChangeKeyboardControl (display, KBBellPitch|KBBellDuration, &ctl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2123
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2124 XBell (display, (volume * 2) - 100);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2125
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2126 ctl.bell_pitch = state.bell_pitch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2127 ctl.bell_duration = state.bell_duration;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2128 XChangeKeyboardControl (display, KBBellPitch|KBBellDuration, &ctl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2129
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2130 /* #### ungrab server? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2131 XSync (display, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2132 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2133 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2134
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2135
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2136 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2137 /* initialization */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2138 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2139
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2140 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2141 console_type_create_redisplay_x (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2142 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2143 /* redisplay methods */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2144 CONSOLE_HAS_METHOD (x, text_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2145 CONSOLE_HAS_METHOD (x, output_display_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2146 CONSOLE_HAS_METHOD (x, divider_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2147 CONSOLE_HAS_METHOD (x, eol_cursor_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2148 CONSOLE_HAS_METHOD (x, output_vertical_divider);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2149 CONSOLE_HAS_METHOD (x, clear_region);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2150 CONSOLE_HAS_METHOD (x, clear_frame);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2151 CONSOLE_HAS_METHOD (x, output_begin);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2152 CONSOLE_HAS_METHOD (x, output_end);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2153 CONSOLE_HAS_METHOD (x, flash);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2154 CONSOLE_HAS_METHOD (x, ring_bell);
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 420
diff changeset
2155 CONSOLE_HAS_METHOD (x, bevel_area);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2156 }