annotate src/redisplay-output.c @ 424:11054d720c21 r21-2-20

Import from CVS: tag r21-2-20
author cvs
date Mon, 13 Aug 2007 11:26:11 +0200
parents 95016f13131a
children
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 /* Synchronize redisplay structures and output changes.
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) 1995, 1996 Ben Wing.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 Copyright (C) 1996 Chuck Thompson.
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
5 Copyright (C) 1999 Andy Piper.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 under the terms of the GNU General Public License as published by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 Free Software Foundation; either version 2, or (at your option) any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 XEmacs is distributed in the hope that it will be useful, but WITHOUT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 You should have received a copy of the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 along with XEmacs; see the file COPYING. If not, write to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22 Boston, MA 02111-1307, USA. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24 /* Synched up with: Not in FSF. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 /* This file has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 /* Author: Chuck Thompson */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
30 /* Heavily hacked for modularity, gutter and subwindow support by Andy
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
31 Piper. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
32
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 #include <config.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 #include "lisp.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 #include "buffer.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 #include "window.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 #include "frame.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 #include "device.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 #include "glyphs.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 #include "redisplay.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 #include "faces.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 static int compare_runes (struct window *w, struct rune *crb,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 struct rune *drb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 static void redraw_cursor_in_window (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 int run_end_begin_glyphs);
388
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
48 static void redisplay_output_display_block (struct window *w, struct display_line *dl,
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
49 int block, int start, int end, int start_pixpos,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
50 int cursor_start, int cursor_width,
388
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
51 int cursor_height);
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
52 static void redisplay_normalize_display_box (struct display_box* dest,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
53 struct display_glyph_area* src);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
54 static int redisplay_display_boxes_in_window_p (struct window* w,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
55 struct display_box* db,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
56 struct display_glyph_area* dga);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
57 static void redisplay_clear_clipped_region (Lisp_Object locale, face_index findex,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
58 struct display_box* dest,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
59 struct display_glyph_area* glyphsrc,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
60 int fullheight_p, Lisp_Object);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63 sync_rune_structs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 Synchronize the given rune blocks.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 sync_rune_structs (struct window *w, rune_dynarr *cra, rune_dynarr *dra)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 int rune_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 int max_move = ((Dynarr_length (dra) > Dynarr_largest (cra))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 ? Dynarr_largest (cra)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 : Dynarr_length (dra));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 if (max_move)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 /* #### Doing this directly breaks the encapsulation. But, the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 running time of this function has a measurable impact on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 redisplay performance so avoiding all excess overhead is a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 good thing. Is all of this true? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 memcpy (cra->base, dra->base, sizeof (struct rune) * max_move);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 Dynarr_set_size (cra, max_move);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 Dynarr_reset (cra);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 for (rune_elt = max_move; rune_elt < Dynarr_length (dra); rune_elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 struct rune rb, *crb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 struct rune *drb = Dynarr_atp (dra, rune_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 crb = &rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 memcpy (crb, drb, sizeof (struct rune));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 Dynarr_add (cra, *crb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 sync_display_line_structs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 For the given LINE in window W, make the current display line equal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 the desired display line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 ****************************************************************************/
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
104 static void
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 sync_display_line_structs (struct window *w, int line, int do_blocks,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 display_line_dynarr *cdla,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 display_line_dynarr *ddla)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 int cdla_len = Dynarr_length (cdla);
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 display_line dl, *clp, *dlp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 int db_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 dlp = Dynarr_atp (ddla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 if (line >= Dynarr_largest (cdla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 clp = &dl;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 116
diff changeset
118 clp->display_blocks = Dynarr_new (display_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 clp = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 if (clp->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 Dynarr_reset (clp->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 if (clp->left_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 Dynarr_free (clp->left_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 clp->left_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 if (clp->right_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 Dynarr_free (clp->right_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 clp->right_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 display_block_dynarr *tdb = clp->display_blocks;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 memcpy (clp, dlp, sizeof (struct display_line));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 clp->display_blocks = tdb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141 clp->left_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142 clp->right_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 if (!do_blocks && line >= cdla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147 Dynarr_add (cdla, *clp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 for (db_elt = 0; db_elt < Dynarr_length (dlp->display_blocks); db_elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153 struct display_block db, *cdb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154 struct display_block *ddb = Dynarr_atp (dlp->display_blocks, db_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
155
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156 if (db_elt >= Dynarr_largest (clp->display_blocks))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 cdb = &db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159 memcpy (cdb, ddb, sizeof (struct display_block));
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 116
diff changeset
160 cdb->runes = Dynarr_new (rune);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 Dynarr_add (clp->display_blocks, *cdb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 rune_dynarr *tr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 cdb = Dynarr_atp (clp->display_blocks, db_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 tr = cdb->runes;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 memcpy (cdb, ddb, sizeof (struct display_block));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 cdb->runes = tr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 Dynarr_increment (clp->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174 sync_rune_structs (w, cdb->runes, ddb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 if (line >= cdla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 Dynarr_add (cdla, *clp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 compare_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 Compare to runes to see if each of their fields is equal. If so,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 return true otherwise return false.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 compare_runes (struct window *w, struct rune *crb, struct rune *drb)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 /* Do not compare the values of bufpos and endpos. They do not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 affect the display characteristics. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
193 if ((crb->findex != drb->findex) ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
194 (WINDOW_FACE_CACHEL_DIRTY (w, drb->findex)))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
195 return 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
196 else if (crb->xpos != drb->xpos)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 else if (crb->width != drb->width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 else if (crb->cursor_type != drb->cursor_type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 else if (crb->type != drb->type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 else if (crb->type == RUNE_CHAR &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 (crb->object.chr.ch != drb->object.chr.ch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206 return 0;
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
207 else if (crb->type == RUNE_HLINE &&
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
208 (crb->object.hline.thickness != drb->object.hline.thickness ||
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
209 crb->object.hline.yoffset != drb->object.hline.yoffset))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
210 return 0;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
211 else if (crb->type == RUNE_DGLYPH &&
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 (!EQ (crb->object.dglyph.glyph, drb->object.dglyph.glyph) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 !EQ (crb->object.dglyph.extent, drb->object.dglyph.extent) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 crb->object.dglyph.xoffset != drb->object.dglyph.xoffset))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215 return 0;
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
216 /* Only check dirtiness if we know something has changed. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
217 else if (crb->type == RUNE_DGLYPH &&
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
218 XFRAME (w->frame)->glyphs_changed)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
219 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
220 glyph_index gindex = get_glyph_cachel_index (w, drb->object.dglyph.glyph);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
221 /* Although doing the cachel lookup for every comparison is
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
222 very expensive.we have to do it to make sure the cache is
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
223 up-to-date. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
224 if (GLYPH_CACHEL_DIRTYP (w, gindex))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
225 return 0;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
226 else
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
227 return 1;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
228 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 get_next_display_block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 Return the next display starting at or overlapping START_POS. Return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 the start of the next region in NEXT_START.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 get_next_display_block (layout_bounds bounds, display_block_dynarr *dba,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 int start_pos, int *next_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 int next_display_block = NO_BLOCK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 int priority = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 int block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 /* If we don't find a display block covering or starting at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 start_pos, then we return the starting point of the next display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 block or the next division boundary, whichever is closer to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 start_pos. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 if (next_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 if (start_pos >= bounds.left_out && start_pos < bounds.left_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 *next_start = bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 else if (start_pos < bounds.left_white)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 *next_start = bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 else if (start_pos < bounds.right_white)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 *next_start = bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 else if (start_pos < bounds.right_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 *next_start = bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 else if (start_pos <= bounds.right_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 *next_start = bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 for (block = 0; block < Dynarr_length (dba); block++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 struct display_block *db = Dynarr_atp (dba, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 if (db->start_pos <= start_pos && db->end_pos > start_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 if ((int) db->type > priority)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 priority = db->type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 next_display_block = block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 if (next_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 *next_start = db->end_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 else if (next_start && db->start_pos > start_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 if (db->start_pos < *next_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 *next_start = db->start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 return next_display_block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 get_cursor_size_and_location
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 Return the information defining the pixel location of the cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 get_cursor_size_and_location (struct window *w, struct display_block *db,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 int cursor_location,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299 int *cursor_start, int *cursor_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 int *cursor_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302 struct rune *rb;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
303 Lisp_Object window;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 int defheight, defwidth;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306 if (Dynarr_length (db->runes) <= cursor_location)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 rb = Dynarr_atp (db->runes, cursor_location);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312 *cursor_start = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 default_face_height_and_width (window, &defheight, &defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 *cursor_height = defheight;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 if (rb->type == RUNE_BLANK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318 *cursor_width = defwidth;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 *cursor_width = rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324 compare_display_blocks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 Given two display blocks, output only those areas where they differ.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329 compare_display_blocks (struct window *w, struct display_line *cdl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330 struct display_line *ddl, int c_block, int d_block,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331 int start_pixpos, int cursor_start, int cursor_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332 int cursor_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 struct display_block *cdb, *ddb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 int start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 int stop_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338 int force = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 int block_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341 cdb = Dynarr_atp (cdl->display_blocks, c_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 ddb = Dynarr_atp (ddl->display_blocks, d_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 assert (cdb->type == ddb->type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 start_pos = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 stop_pos = min (Dynarr_length (cdb->runes), Dynarr_length (ddb->runes));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349 block_end =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350 (!Dynarr_length (ddb->runes)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351 ? 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352 : (Dynarr_atp (ddb->runes, Dynarr_length (ddb->runes) - 1)->xpos +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353 Dynarr_atp (ddb->runes, Dynarr_length (ddb->runes) - 1)->width));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 /* If the new block type is not text and the cursor status is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 changing and it overlaps the position of this block then force a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357 full redraw of the block in order to make sure that the cursor is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 updated properly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 if (ddb->type != TEXT
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
360 #if 0
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
361 /* I'm not sure exactly what this code wants to do, but it's
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
362 * not right--it doesn't update when cursor_elt changes from, e.g.,
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
363 * 0 to 8, and the new or old cursor loc overlaps this block.
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
364 * I've replaced it with the more conservative test below.
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
365 * -dkindred@cs.cmu.edu 23-Mar-1997 */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366 && ((cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 && (ddl->cursor_elt == -1 ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369 (cursor_start
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 && cursor_width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 && (cursor_start + cursor_width) >= start_pixpos
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
372 && cursor_start <= block_end))
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
373 #else
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
374 && (cdl->cursor_elt != ddl->cursor_elt)
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
375 #endif
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
376 )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 force = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 if (f->windows_structure_changed ||
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
380 /* #### Why is this so? We have face cachels so that we don't
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
381 have to recalculate all the display blocks when faces
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
382 change. I have fixed this for glyphs and am inclined to think
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
383 that faces should "Just Work", but I'm not feeling brave
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
384 today. Maybe its because the face cachels represent merged
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
385 faces rather than simply instantiations in a particular
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
386 domain. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 f->faces_changed ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 cdl->ypos != ddl->ypos ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389 cdl->ascent != ddl->ascent ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390 cdl->descent != ddl->descent ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 cdl->clip != ddl->clip ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 force)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 start_pos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 force = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399 int elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 while (start_pos < 0 && elt < stop_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403 if (!compare_runes (w, Dynarr_atp (cdb->runes, elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 Dynarr_atp (ddb->runes, elt)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406 start_pos = 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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 /* If nothing has changed in the area where the blocks overlap, but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 there are new blocks in the desired block, then adjust the start
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 point accordingly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 if (elt == stop_pos && stop_pos < Dynarr_length (ddb->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 start_pos = stop_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 if (start_pos >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 if ((Dynarr_length (ddb->runes) != Dynarr_length (cdb->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 || force)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 stop_pos = Dynarr_length (ddb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 /* If the lines have the same number of runes and we are not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 forcing a full redraw because the display line has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 changed position then we try and optimize how much of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 line we actually redraw by scanning backwards from the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 end for the first changed rune. This optimization is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 almost always triggered by face changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 int elt = Dynarr_length (ddb->runes) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 while (elt > start_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 if (!compare_runes (w, Dynarr_atp (cdb->runes, elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 Dynarr_atp (ddb->runes, elt)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 stop_pos = elt + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449
388
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
450 redisplay_output_display_block (w, ddl, d_block, start_pos,
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
451 stop_pos, start_pixpos,
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
452 cursor_start, cursor_width,
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
453 cursor_height);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 clear_left_border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 Clear the lefthand outside border.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466 clear_left_border (struct window *w, int y, int height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 XSETWINDOW (window, w);
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
472 redisplay_clear_region (window, DEFAULT_INDEX,
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
473 FRAME_LEFT_BORDER_START (f), y,
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
474 FRAME_BORDER_WIDTH (f), height);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478 clear_right_border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480 Clear the righthand outside border.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483 clear_right_border (struct window *w, int y, int height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 XSETWINDOW (window, w);
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
489 redisplay_clear_region (window, DEFAULT_INDEX,
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
490 FRAME_RIGHT_BORDER_START (f),
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
491 y, FRAME_BORDER_WIDTH (f), height);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 output_display_line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 Ensure that the contents of the given display line is correct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 on-screen. The force_ parameters are used by redisplay_move_cursor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 to correctly update cursor locations and only cursor locations.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 output_display_line (struct window *w, display_line_dynarr *cdla,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 display_line_dynarr *ddla, int line, int force_start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 int force_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 struct buffer *old_b = window_display_buffer (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 struct display_line *cdl, *ddl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 display_block_dynarr *cdba, *ddba;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 int start_pixpos, end_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 int cursor_start, cursor_width, cursor_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 int force = (force_start >= 0 || force_end >= 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 int clear_border = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 int must_sync = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 if (cdla && line < Dynarr_length (cdla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 cdl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 cdba = cdl->display_blocks;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 cdl = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 cdba = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 ddl = Dynarr_atp (ddla, line); /* assert line < Dynarr_length (ddla) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 ddba = ddl->display_blocks;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533 if (force_start >= 0 && force_start >= ddl->bounds.left_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 start_pixpos = force_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 start_pixpos = ddl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 if (force_end >= 0 && force_end < ddl->bounds.right_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 end_pixpos = force_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 end_pixpos = ddl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 /* Get the cursor parameters. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 if (ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 /* If the lines cursor parameter is not -1 then it indicates
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 which rune in the TEXT block contains the cursor. This means
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 that there must be at least one display block. The TEXT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 block, if present, must always be the first display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 assert (Dynarr_length (ddba) != 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 db = Dynarr_atp (ddba, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 assert (db->type == TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 get_cursor_size_and_location (w, db, ddl->cursor_elt, &cursor_start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 &cursor_width, &cursor_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 cursor_start = cursor_width = cursor_height = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565 /* The modeline should only have a single block and it had better be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 a TEXT block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 if (ddl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 {
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 282
diff changeset
569 /* The shadow thickness check is necessary if only the sign of
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 the size changed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 if (cdba && !w->shadow_thickness_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 must_sync |= compare_display_blocks (w, cdl, ddl, 0, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 start_pixpos, 0, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 {
388
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
578 redisplay_output_display_block (w, ddl, 0, 0, -1, start_pixpos,
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
579 0, 0, 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 must_sync = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 if (must_sync)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 clear_border = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587 while (!ddl->modeline && start_pixpos < end_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589 int block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 int next_start_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 block = get_next_display_block (ddl->bounds, ddba, start_pixpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 &next_start_pixpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595 /* If we didn't find a block then we should blank the area
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 between start_pos and next_start if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597 if (block == NO_BLOCK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 /* We only erase those areas which were actually previously
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 covered by a display block unless the window structure
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 changed. In that case we clear all areas since the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 structures may actually represent a different buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 while (start_pixpos < next_start_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 int block_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 int old_block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 if (cdba)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 old_block = get_next_display_block (ddl->bounds, cdba,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 start_pixpos, &block_end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 old_block = NO_BLOCK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 block_end = next_start_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 if (!cdba || old_block != NO_BLOCK || b != old_b ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 f->windows_structure_changed ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 f->faces_changed ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 force ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621 (cdl && (cdl->ypos != ddl->ypos ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 cdl->ascent != ddl->ascent ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 cdl->descent != ddl->descent ||
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
624 cdl->top_clip != ddl->top_clip ||
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 cdl->clip != ddl->clip)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 int x, y, width, height;
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
628 face_index findex;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 must_sync = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 x = start_pixpos;
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
632 y = DISPLAY_LINE_YPOS (ddl);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 width = min (next_start_pixpos, block_end) - x;
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
634 height = DISPLAY_LINE_HEIGHT (ddl);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 if (x < ddl->bounds.left_in)
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
637 {
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
638 findex = ddl->left_margin_findex ?
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
639 ddl->left_margin_findex
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
640 : get_builtin_face_cache_index (w, Vleft_margin_face);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
641 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 else if (x < ddl->bounds.right_in)
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
643 {
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
644 /* no check here because DEFAULT_INDEX == 0 anyway */
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
645 findex = ddl->default_findex;
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
646 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 else if (x < ddl->bounds.right_out)
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
648 {
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
649 findex = ddl->right_margin_findex ?
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
650 ddl->right_margin_findex
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
651 : get_builtin_face_cache_index (w, Vright_margin_face);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
652 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 else
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
654 findex = (face_index) -1;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
656 if (findex != (face_index) -1)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662 /* Clear the empty area. */
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
663 redisplay_clear_region (window, findex, x, y, width, height);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 /* Mark that we should clear the border. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 necessary because italic fonts may leave
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 droppings in the border. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 clear_border = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 start_pixpos = min (next_start_pixpos, block_end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677 struct display_block *cdb, *ddb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 int block_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 int old_block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681 if (cdba)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 old_block = get_next_display_block (ddl->bounds, cdba,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 start_pixpos, &block_end);
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 old_block = NO_BLOCK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 ddb = Dynarr_atp (ddba, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688 cdb = (old_block != NO_BLOCK ? Dynarr_atp (cdba, old_block) : 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 /* If there was formerly no block over the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 region or if it was a block of a different type, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 output the entire ddb. Otherwise, compare cdb and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 ddb and output only the changed region. */
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
694 if (!force && cdb && ddb->type == cdb->type
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
695 /* If there was no buffer being display before the
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
696 compare anyway as we might be outputting a gutter. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
697 &&
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
698 (b == old_b || !old_b))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700 must_sync |= compare_display_blocks (w, cdl, ddl, old_block,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 block, start_pixpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 cursor_start, cursor_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703 cursor_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 int first_elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709 int last_elt = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 for (elt = 0; elt < Dynarr_length (ddb->runes); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 struct rune *rb = Dynarr_atp (ddb->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 if (start_pixpos >= rb->xpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 && start_pixpos < rb->xpos + rb->width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717 first_elt = elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719 if (end_pixpos > rb->xpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 && end_pixpos <= rb->xpos + rb->width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 last_elt = elt + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723 if (last_elt > Dynarr_length (ddb->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724 last_elt = Dynarr_length (ddb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 must_sync = 1;
388
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
730 redisplay_output_display_block (w, ddl, block, first_elt,
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
731 last_elt,
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
732 start_pixpos,
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
733 cursor_start, cursor_width,
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
734 cursor_height);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 }
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
736
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737 start_pixpos = next_start_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741 /* Clear the internal border if we are next to it and the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742 structure or frame size has changed or if something caused
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 clear_border to be tripped. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744 /* #### Doing this on f->clear sucks but is necessary because of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 window-local background values. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 if (f->windows_structure_changed || f->faces_changed || clear_border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 || f->clear)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 {
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
749 int y = DISPLAY_LINE_YPOS (ddl);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
750 int height = DISPLAY_LINE_HEIGHT (ddl);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
752 /* If we are in the gutter then we musn't clear the borders. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
753 if (y >= WINDOW_TEXT_TOP (w) && (y + height) <= WINDOW_TEXT_BOTTOM (w))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754 {
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
755 if (ddl->modeline)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
756 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
757 y -= MODELINE_SHADOW_THICKNESS (w);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
758 height += (2 * MODELINE_SHADOW_THICKNESS (w));
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
759 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
760
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
761 if (window_is_leftmost (w))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
762 clear_left_border (w, y, height);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
763 if (window_is_rightmost (w))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
764 clear_right_border (w, y, height);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
765 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768 if (cdla)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769 sync_display_line_structs (w, line, must_sync, cdla, ddla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 redisplay_move_cursor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775 For the given window W, move the cursor to NEW_POINT. Returns a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
776 boolean indicating success or failure.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 #define ADJ_BUFPOS (rb->bufpos + dl->offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780 #define ADJ_ENDPOS (rb->endpos + dl->offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 redisplay_move_cursor (struct window *w, Bufpos new_point, int no_output_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789 struct display_line *dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791 struct rune *rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792 int x = w->last_point_x[CURRENT_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793 int y = w->last_point_y[CURRENT_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794
263
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
795 /*
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
796 * Bail if cursor_in_echo_area is non-zero and we're fiddling with
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
797 * the cursor in a non-active minibuffer window, since that is a
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
798 * special case that is handled elsewhere and this function need
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
799 * not handle it. Return 1 so the caller will assume we
263
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
800 * succeeded.
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
801 */
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
802 if (cursor_in_echo_area && MINI_WINDOW_P (w) &&
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
803 w != XWINDOW (FRAME_SELECTED_WINDOW (f)))
263
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
804 return 1;
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
805
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 if (y < 0 || y >= Dynarr_length (cla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 dl = Dynarr_atp (cla, y);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812 if (x < 0 || x >= Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815 rb = Dynarr_atp (db->runes, x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 if (rb->cursor_type == CURSOR_OFF)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 else if (ADJ_BUFPOS == new_point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 || (ADJ_ENDPOS && (new_point >= ADJ_BUFPOS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821 && (new_point <= ADJ_ENDPOS)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 w->last_point_x[CURRENT_DISP] = x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 w->last_point_y[CURRENT_DISP] = y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 Fset_marker (w->last_point[CURRENT_DISP], make_int (ADJ_BUFPOS),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 dl->cursor_elt = x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
832 DEVMETH (d, output_begin, (d));
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
833
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
834 /* #### This is a gross kludge. Cursor handling is such a royal
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
835 pain in the ass. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
836 if (rb->type == RUNE_DGLYPH &&
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
837 (EQ (rb->object.dglyph.glyph, Vtruncation_glyph) ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
838 EQ (rb->object.dglyph.glyph, Vcontinuation_glyph)))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
839 rb->cursor_type = NO_CURSOR;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
840 else
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
841 rb->cursor_type = CURSOR_OFF;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 dl->cursor_elt = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 output_display_line (w, 0, cla, y, rb->xpos, rb->xpos + rb->width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846 w->last_point_x[CURRENT_DISP] = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847 w->last_point_y[CURRENT_DISP] = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 Fset_marker (w->last_point[CURRENT_DISP], Qnil, w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 /* If this isn't the selected frame, then erasing the old cursor is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 all we actually had to do. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 if (w != XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d))))
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 (!no_output_end)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
855 DEVMETH (d, output_end, (d));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860 /* This should only occur in the minibuffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 if (new_point == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 w->last_point_x[CURRENT_DISP] = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 w->last_point_y[CURRENT_DISP] = y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 Fset_marker (w->last_point[CURRENT_DISP], Qzero, w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867 rb = Dynarr_atp (db->runes, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 rb->cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869 dl->cursor_elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 output_display_line (w, 0, cla, y, rb->xpos, rb->xpos + rb->width);
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 (!no_output_end)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
874 DEVMETH (d, output_end, (d));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 int cur_rb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 int first = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 int cur_dl, up;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 if (ADJ_BUFPOS < new_point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 up = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 cur_rb = x + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 cur_dl = y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 else /* (rb->bufpos + dl->offset) > new_point */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 up = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
892
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 if (!x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895 cur_dl = y - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 first = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 cur_rb = x - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 cur_dl = y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 first = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
903 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
904 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
906 while ((up ? (cur_dl < Dynarr_length (cla)) : (cur_dl >= 0)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 dl = Dynarr_atp (cla, cur_dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911 if (!up && !first)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912 cur_rb = Dynarr_length (db->runes) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 while ((!scroll_on_clipped_lines || !dl->clip) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 (up ? (cur_rb < Dynarr_length (db->runes)) : (cur_rb >= 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 rb = Dynarr_atp (db->runes, cur_rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 if (rb->cursor_type != IGNORE_CURSOR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 && rb->cursor_type != NO_CURSOR &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 (ADJ_BUFPOS == new_point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 || (ADJ_ENDPOS && (new_point >= ADJ_BUFPOS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 && (new_point <= ADJ_BUFPOS))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 rb->cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 dl->cursor_elt = cur_rb;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 116
diff changeset
927
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 output_display_line (w, 0, cla, cur_dl, rb->xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 rb->xpos + rb->width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932 w->last_point_x[CURRENT_DISP] = cur_rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 w->last_point_y[CURRENT_DISP] = cur_dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 Fset_marker (w->last_point[CURRENT_DISP],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 make_int (ADJ_BUFPOS), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 if (!no_output_end)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
938 DEVMETH (d, output_end, (d));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 (up ? cur_rb++ : cur_rb--);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 (up ? (cur_rb = 0) : (first = 0));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 (up ? cur_dl++ : cur_dl--);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 if (!no_output_end)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
951 DEVMETH (d, output_end, (d));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 #undef ADJ_BUFPOS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 #undef ADJ_ENDPOS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958 redraw_cursor_in_window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960 For the given window W, redraw the cursor if it is contained within
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 the window.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964 redraw_cursor_in_window (struct window *w, int run_end_begin_meths)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 struct display_line *dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 struct rune *rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974 int x = w->last_point_x[CURRENT_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 int y = w->last_point_y[CURRENT_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
977 if (cursor_in_echo_area && MINI_WINDOW_P (w) &&
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
978 !echo_area_active (f) && minibuf_level == 0)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
979 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
980 MAYBE_DEVMETH (d, set_final_cursor_coords, (f, w->pixel_top, 0));
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
981 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
982
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 if (y < 0 || y >= Dynarr_length (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 if (MINI_WINDOW_P (w) && f != device_selected_frame (d) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987 !is_surrogate_for_selected_frame (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 dl = Dynarr_atp (dla, y);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 if (x < 0 || x >= Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 rb = Dynarr_atp (db->runes, x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 /* Don't call the output routine if the block isn't actually the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 cursor. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000 if (rb->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 {
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
1002 MAYBE_DEVMETH (d, set_final_cursor_coords,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
1003 (f, dl->ypos - 1, rb->xpos));
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 263
diff changeset
1004
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 if (run_end_begin_meths)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1006 DEVMETH (d, output_begin, (d));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 output_display_line (w, 0, dla, y, rb->xpos, rb->xpos + rb->width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 if (run_end_begin_meths)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1011 DEVMETH (d, output_end, (d));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1013 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 redisplay_redraw_cursor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 For the given frame F, redraw the cursor on the selected window.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019 This is used to update the cursor after focus changes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 redisplay_redraw_cursor (struct frame *f, int run_end_begin_meths)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1024 Lisp_Object window;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1025
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1026 if (!cursor_in_echo_area)
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1027 window = FRAME_SELECTED_WINDOW (f);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1028 else if (FRAME_HAS_MINIBUF_P (f))
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1029 window = FRAME_MINIBUF_WINDOW (f);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1030 else
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1031 return;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1032
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1033 redraw_cursor_in_window (XWINDOW (window), run_end_begin_meths);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1036 /****************************************************************************
388
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1037 redisplay_output_display_block
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1038
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1039 Given a display line, a block number for that start line, output all
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1040 runes between start and end in the specified display block.
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1041 ****************************************************************************/
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1042 static void
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1043 redisplay_output_display_block (struct window *w, struct display_line *dl, int block,
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1044 int start, int end, int start_pixpos, int cursor_start,
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1045 int cursor_width, int cursor_height)
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1046 {
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1047 struct frame *f = XFRAME (w->frame);
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1048 struct device *d = XDEVICE (f->device);
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1049 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1050 rune_dynarr *rba = db->runes;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1051 struct rune *rb;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1052 int xpos, width;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1053 rb = Dynarr_atp (rba, start);
388
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1054
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1055 if (!rb)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1056 /* Nothing to do so don't do anything. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1057 return;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1058
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1059 xpos = max (start_pixpos, rb->xpos);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1060
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1061 if (end < 0)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1062 end = Dynarr_length (rba);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1063
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1064 rb = Dynarr_atp (rba, end - 1);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1065 width = rb->xpos + rb->width - xpos;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1066 /* now actually output the block. */
388
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1067 DEVMETH (d, output_display_block, (w, dl, block, start,
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1068 end, start_pixpos,
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1069 cursor_start, cursor_width,
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1070 cursor_height));
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1071 }
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1072
388
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1073 /****************************************************************************
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1074 redisplay_unmap_subwindows
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1075
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1076 Remove subwindows from the area in the box defined by the given
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1077 parameters.
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1078 ****************************************************************************/
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1079 static void redisplay_unmap_subwindows (struct frame* f, int x, int y, int width, int height,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1080 Lisp_Object ignored_window)
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1081 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1082 int elt;
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1083
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1084 for (elt = 0; elt < Dynarr_length (f->subwindow_cachels); elt++)
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1085 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1086 struct subwindow_cachel *cachel =
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1087 Dynarr_atp (f->subwindow_cachels, elt);
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1088
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1089 if (cachel->being_displayed
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1090 &&
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1091 cachel->x + cachel->width > x && cachel->x < x + width
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1092 &&
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1093 cachel->y + cachel->height > y && cachel->y < y + height
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1094 &&
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1095 !EQ (cachel->subwindow, ignored_window))
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1096 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1097 unmap_subwindow (cachel->subwindow);
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1098 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1099 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1100 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1101
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1102 /****************************************************************************
388
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1103 redisplay_unmap_subwindows_maybe
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1104
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1105 Potentially subwindows from the area in the box defined by the given
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1106 parameters.
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1107 ****************************************************************************/
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1108 void redisplay_unmap_subwindows_maybe (struct frame* f, int x, int y, int width, int height)
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1109 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1110 if (Dynarr_length (FRAME_SUBWINDOW_CACHE (f)))
388
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1111 {
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1112 redisplay_unmap_subwindows (f, x, y, width, height, Qnil);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1113 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1114 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1115
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1116 static void redisplay_unmap_subwindows_except_us (struct frame* f, int x, int y, int width,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1117 int height, Lisp_Object subwindow)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1118 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1119 if (Dynarr_length (FRAME_SUBWINDOW_CACHE (f)))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1120 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1121 redisplay_unmap_subwindows (f, x, y, width, height, subwindow);
388
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1122 }
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1123 }
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1124
aabb7f5b1c81 Import from CVS: tag r21-2-9
cvs
parents: 384
diff changeset
1125 /****************************************************************************
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1126 redisplay_output_subwindow
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1127
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1128 output a subwindow. This code borrows heavily from the pixmap stuff,
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1129 although is much simpler not needing to account for partial
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1130 pixmaps, backgrounds etc.
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1131 ****************************************************************************/
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1132 void
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1133 redisplay_output_subwindow (struct window *w,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1134 Lisp_Object image_instance,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1135 struct display_box* db, struct display_glyph_area* dga,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1136 face_index findex, int cursor_start, int cursor_width,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1137 int cursor_height)
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1138 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1139 struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1140 Lisp_Object window;
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1141 struct display_glyph_area sdga;
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1142
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1143 dga->height = IMAGE_INSTANCE_SUBWINDOW_HEIGHT (p);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1144 dga->width = IMAGE_INSTANCE_SUBWINDOW_WIDTH (p);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1145
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1146 /* This makes the glyph area fit into the display area. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1147 if (!redisplay_normalize_glyph_area (db, dga))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1148 return;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1149
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1150 XSETWINDOW (window, w);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1151
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1152 /* Clear the area the subwindow is going into. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1153 redisplay_clear_clipped_region (window, findex,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1154 db, dga, 0, image_instance);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1155
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1156 /* This shrinks the display box to exactly enclose the glyph
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1157 area. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1158 redisplay_normalize_display_box (db, dga);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1159
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1160 /* if we can't view the whole window we can't view any of it. We
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1161 have to be careful here since we may be being asked to display
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1162 part of a subwindow, the rest of which is on-screen as well. We
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1163 need to allow this case and map the entire subwindow. We also
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1164 need to be careful since the subwindow could be outside the
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1165 window in the gutter or modeline - we also need to allow these
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1166 cases.*/
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1167 sdga.xoffset = -dga->xoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1168 sdga.yoffset = -dga->yoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1169 sdga.height = IMAGE_INSTANCE_SUBWINDOW_HEIGHT (p);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1170 sdga.width = IMAGE_INSTANCE_SUBWINDOW_WIDTH (p);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1171
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1172 if (redisplay_display_boxes_in_window_p (w, db, &sdga) < 0)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1173 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1174 map_subwindow (image_instance, db->xpos, db->ypos, dga);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1175 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1176 else
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1177 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1178 sdga.xoffset = sdga.yoffset = 0;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1179 map_subwindow (image_instance, db->xpos - dga->xoffset,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1180 db->ypos - dga->yoffset, &sdga);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1181 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1182 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1183
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1184 /****************************************************************************
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1185 redisplay_output_layout
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1186
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1187 Output a widget hierarchy. This can safely call itself recursively.
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1188 ****************************************************************************/
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1189 void
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1190 redisplay_output_layout (struct window *w,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1191 Lisp_Object image_instance,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1192 struct display_box* db, struct display_glyph_area* dga,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1193 face_index findex, int cursor_start, int cursor_width,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1194 int cursor_height)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1195 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1196 struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1197 Lisp_Object window, rest;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1198 Emchar_dynarr *buf = Dynarr_new (Emchar);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1199 struct frame *f = XFRAME (w->frame);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1200 struct device *d = XDEVICE (f->device);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1201 int layout_height, layout_width;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1202 /* We bogusly don't take f->extents_changed and f->glyphs_changed
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1203 into account. This is because if we do we always redisplay the
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1204 entire layout. So far I have seen no ill effects to we'll see. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1205 int frame_changed = (f->buffers_changed ||
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1206 f->clip_changed ||
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1207 f->faces_changed ||
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1208 f->frame_changed ||
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1209 f->modeline_changed ||
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1210 f->subwindows_changed ||
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1211 f->windows_changed ||
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1212 f->windows_structure_changed);
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1213
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1214 XSETWINDOW (window, w);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1215
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1216 layout_height = glyph_height (image_instance, Qnil, findex, window);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1217 layout_width = glyph_width (image_instance, Qnil, findex, window);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1218
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1219 dga->height = layout_height;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1220 dga->width = layout_width;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1221
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1222 /* This makes the glyph area fit into the display area. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1223 if (!redisplay_normalize_glyph_area (db, dga))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1224 return;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1225
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1226 /* Highly dodgy optimization. We want to only output the whole
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1227 layout if we really have to. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1228 if (frame_changed || IMAGE_INSTANCE_DIRTYP (p))
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1229 {
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1230 /* First clear the area we are drawing into. This is the easiest
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1231 thing to do since we have many gaps that we have to make sure are
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1232 filled in. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1233 redisplay_clear_clipped_region (window, findex, db, dga, 1, Qnil);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1234
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1235 /* Output a border if required */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1236 if (!NILP (IMAGE_INSTANCE_LAYOUT_BORDER (p)))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1237 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1238 int edges = 0;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1239 enum edge_style style;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1240 int ypos = db->ypos;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1241 int height = dga->height;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1242
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1243 if (dga->xoffset >= 0)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1244 edges |= EDGE_LEFT;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1245 if (dga->width - dga->xoffset == layout_width)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1246 edges |= EDGE_RIGHT;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1247 if (dga->yoffset >= 0)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1248 edges |= EDGE_TOP;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1249 if (dga->height - dga->yoffset == layout_height)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1250 edges |= EDGE_BOTTOM;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1251
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1252 if (EQ (IMAGE_INSTANCE_LAYOUT_BORDER (p), Qetched_in))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1253 style = EDGE_ETCHED_IN;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1254 else if (EQ (IMAGE_INSTANCE_LAYOUT_BORDER (p), Qetched_out))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1255 style = EDGE_ETCHED_OUT;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1256 else if (EQ (IMAGE_INSTANCE_LAYOUT_BORDER (p), Qbevel_in))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1257 style = EDGE_BEVEL_IN;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1258 else if (INTP (IMAGE_INSTANCE_LAYOUT_BORDER (p)))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1259 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1260 style = EDGE_ETCHED_IN;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1261 if (edges & EDGE_TOP)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1262 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1263 ypos += XINT (IMAGE_INSTANCE_LAYOUT_BORDER (p));
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1264 height -= XINT (IMAGE_INSTANCE_LAYOUT_BORDER (p));
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1265 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1266 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1267 else
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1268 style = EDGE_BEVEL_OUT;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 388
diff changeset
1269
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1270 MAYBE_DEVMETH (d, bevel_area,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1271 (w, findex, db->xpos,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1272 ypos,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1273 dga->width, height, 2, edges, style));
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1274 }
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1275 }
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1276
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1277 /* This shrinks the display box to exactly enclose the glyph
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1278 area. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1279 redisplay_normalize_display_box (db, dga);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1280
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1281 /* Flip through the widgets in the layout displaying as necessary */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1282 LIST_LOOP (rest, IMAGE_INSTANCE_LAYOUT_CHILDREN (p))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 388
diff changeset
1283 {
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1284 Lisp_Object child = XCAR (rest);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1285
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1286 struct display_box cdb;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1287 /* For losing HP-UX */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1288 cdb.xpos = db->xpos;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1289 cdb.ypos = db->ypos;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1290 cdb.width = db->width;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1291 cdb.height = db->height;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1292
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1293 /* First determine if the image is visible at all */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1294 if (IMAGE_INSTANCEP (child))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1295 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1296 struct Lisp_Image_Instance* childii = XIMAGE_INSTANCE (child);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1297 /* The enclosing layout offsets are +ve at this point */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1298 struct display_glyph_area cdga;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1299 cdga.xoffset = IMAGE_INSTANCE_XOFFSET (childii) - dga->xoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1300 cdga.yoffset = IMAGE_INSTANCE_YOFFSET (childii) - dga->yoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1301 cdga.width = glyph_width (child, Qnil, findex, window);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1302 cdga.height = glyph_height (child, Qnil, findex, window);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1303
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1304 /* Although normalization is done by the output routines
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1305 we have to do it here so that they don't try and
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1306 clear all of db. This is true below also. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1307 if (redisplay_normalize_glyph_area (&cdb, &cdga))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1308 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1309 redisplay_normalize_display_box (&cdb, &cdga);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1310 /* Since the display boxes will now be totally in the
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1311 window if they are visible at all we can now check this easily. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1312 if (cdb.xpos < db->xpos || cdb.ypos < db->ypos
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1313 || cdb.xpos + cdb.width > db->xpos + db->width
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1314 || cdb.ypos + cdb.height > db->ypos + db->height)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1315 continue;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1316 /* We have to invert the offset here as normalization
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1317 will have made them positive which the output
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1318 routines will treat as a truely +ve offset. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1319 cdga.xoffset = -cdga.xoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1320 cdga.yoffset = -cdga.yoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1321
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1322 switch (IMAGE_INSTANCE_TYPE (childii))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1323 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1324 case IMAGE_TEXT:
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1325 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1326 /* #### This is well hacked and could use some
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1327 generalisation.*/
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1328 if (redisplay_normalize_glyph_area (&cdb, &cdga)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1329 &&
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1330 (frame_changed || IMAGE_INSTANCE_DIRTYP (childii)))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1331 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1332 struct display_line dl; /* this is fake */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1333 Lisp_Object string =
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1334 IMAGE_INSTANCE_TEXT_STRING (childii);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1335 convert_bufbyte_string_into_emchar_dynarr
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1336 (XSTRING_DATA (string), XSTRING_LENGTH (string), buf);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1337
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1338 redisplay_normalize_display_box (&cdb, &cdga);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1339 /* Offsets are now +ve again so be careful
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1340 when fixing up the display line. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1341 xzero (dl);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1342 /* Munge boxes into display lines. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1343 dl.ypos = (cdb.ypos - cdga.yoffset)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1344 + glyph_ascent (child, Qnil, findex, window);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1345 dl.ascent = glyph_ascent (child, Qnil, findex, window);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1346 dl.descent = glyph_descent (child, Qnil, findex, window);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1347 dl.top_clip = cdga.yoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1348 dl.clip = (dl.ypos + dl.descent) - (cdb.ypos + cdb.height);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1349 /* output_string doesn't understand offsets in
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1350 the same way as other routines - we have to
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1351 add the offset to the width so that we
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1352 output the full string. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1353 MAYBE_DEVMETH (d, output_string, (w, &dl, buf, cdb.xpos,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1354 cdga.xoffset, cdb.xpos,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1355 cdga.width + cdga.xoffset,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1356 findex, 0, 0, 0, 0));
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1357 Dynarr_reset (buf);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1358 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1359 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1360 break;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1361
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1362 case IMAGE_MONO_PIXMAP:
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1363 case IMAGE_COLOR_PIXMAP:
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1364 if (frame_changed || IMAGE_INSTANCE_DIRTYP (childii))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1365 redisplay_output_pixmap (w, child, &cdb, &cdga, findex,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1366 0, 0, 0, 0);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1367 break;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1368
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1369 case IMAGE_WIDGET:
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1370 case IMAGE_SUBWINDOW:
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1371 if (frame_changed || IMAGE_INSTANCE_DIRTYP (childii))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1372 redisplay_output_subwindow (w, child, &cdb, &cdga, findex,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1373 0, 0, 0);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1374 break;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1375
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1376 case IMAGE_LAYOUT:
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1377 redisplay_output_layout (w, child, &cdb, &cdga, findex,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1378 0, 0, 0);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1379 break;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1380
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1381 case IMAGE_NOTHING:
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1382 /* nothing is as nothing does */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1383 break;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1384
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1385 case IMAGE_POINTER:
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1386 default:
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1387 abort ();
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1388 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1389 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1390 }
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 388
diff changeset
1391 }
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1392 Dynarr_free (buf);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1393 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1394
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1395 /****************************************************************************
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1396 redisplay_output_pixmap
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1397
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1398
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1399 output a pixmap.
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1400 ****************************************************************************/
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1401 void
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1402 redisplay_output_pixmap (struct window *w,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1403 Lisp_Object image_instance,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1404 struct display_box* db, struct display_glyph_area* dga,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1405 face_index findex, int cursor_start, int cursor_width,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1406 int cursor_height, int offset_bitmap)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1407 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1408 struct frame *f = XFRAME (w->frame);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1409 struct device *d = XDEVICE (f->device);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1410 struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1411 Lisp_Object window;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1412 XSETWINDOW (window, w);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1413
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1414 dga->height = IMAGE_INSTANCE_PIXMAP_HEIGHT (p);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1415 dga->width = IMAGE_INSTANCE_PIXMAP_WIDTH (p);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1416
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1417 /* This makes the glyph area fit into the display area. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1418 if (!redisplay_normalize_glyph_area (db, dga))
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1419 return;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1420
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1421 /* Clear the area the pixmap is going into. The pixmap itself will
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1422 always take care of the full width. We don't want to clear where
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1423 it is going to go in order to avoid flicker. So, all we have to
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1424 take care of is any area above or below the pixmap. If the pixmap
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1425 has a mask in which case we have to clear the whole damn thing
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1426 since we can't yet clear just the area not included in the
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1427 mask. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1428 if (!offset_bitmap)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1429 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1430 redisplay_clear_clipped_region (window, findex,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1431 db, dga,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1432 (int)IMAGE_INSTANCE_PIXMAP_MASK (p),
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1433 Qnil);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1434
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1435 /* This shrinks the display box to exactly enclose the glyph
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1436 area. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1437 redisplay_normalize_display_box (db, dga);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1438 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1439 assert (db->xpos >= 0 && db->ypos >= 0);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1440
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1441 MAYBE_DEVMETH (d, output_pixmap, (w, image_instance,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1442 db, dga,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1443 findex, cursor_start,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1444 cursor_width, cursor_height,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1445 offset_bitmap));
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1446 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1447
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1448 /****************************************************************************
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1449 redisplay_clear_region
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1450
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1451 Clear the area in the box defined by the given parameters using the
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1452 given face. This has been generalised so that subwindows can be
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1453 coped with effectively.
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1454 ****************************************************************************/
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1455 void
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1456 redisplay_clear_region (Lisp_Object locale, face_index findex, int x, int y,
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1457 int width, int height)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1458 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1459 struct window *w = NULL;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1460 struct frame *f = NULL;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1461 struct device *d;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1462 Lisp_Object background_pixmap = Qunbound;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1463 Lisp_Object fcolor = Qnil, bcolor = Qnil;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1464
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1465 if (!width || !height)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1466 return;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1467
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1468 if (WINDOWP (locale))
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1469 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1470 w = XWINDOW (locale);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1471 f = XFRAME (w->frame);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1472 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1473 else if (FRAMEP (locale))
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1474 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1475 w = NULL;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1476 f = XFRAME (locale);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1477 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1478 else
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1479 abort ();
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1480
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1481 d = XDEVICE (f->device);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1482
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1483 /* if we have subwindows in the region we have to unmap them */
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1484 redisplay_unmap_subwindows_maybe (f, x, y, width, height);
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1485
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1486 /* #### This isn't quite right for when this function is called
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1487 from the toolbar code. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1488
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1489 /* Don't use a backing pixmap in the border area */
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1490 if (x >= FRAME_LEFT_BORDER_END (f)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1491 && x < FRAME_RIGHT_BORDER_START (f)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1492 && y >= FRAME_TOP_BORDER_END (f)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1493 && y < FRAME_BOTTOM_BORDER_START (f))
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1494 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1495 Lisp_Object temp;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1496
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1497 if (w)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1498 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1499 temp = WINDOW_FACE_CACHEL_BACKGROUND_PIXMAP (w, findex);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1500
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1501 if (IMAGE_INSTANCEP (temp)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1502 && IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (temp)))
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1503 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1504 /* #### maybe we could implement such that a string
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1505 can be a background pixmap? */
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1506 background_pixmap = temp;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1507 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1508 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1509 else
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1510 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1511 temp = FACE_BACKGROUND_PIXMAP (Vdefault_face, locale);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1512
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1513 if (IMAGE_INSTANCEP (temp)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1514 && IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (temp)))
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1515 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1516 background_pixmap = temp;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1517 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1518 }
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1519 }
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1520
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1521 if (!UNBOUNDP (background_pixmap) &&
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1522 XIMAGE_INSTANCE_PIXMAP_DEPTH (background_pixmap) == 0)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1523 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1524 if (w)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1525 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1526 fcolor = WINDOW_FACE_CACHEL_FOREGROUND (w, findex);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1527 bcolor = WINDOW_FACE_CACHEL_BACKGROUND (w, findex);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1528 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1529 else
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1530 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1531 fcolor = FACE_FOREGROUND (Vdefault_face, locale);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1532 bcolor = FACE_BACKGROUND (Vdefault_face, locale);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1533 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1534 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1535 else
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1536 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1537 fcolor = (w ?
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1538 WINDOW_FACE_CACHEL_BACKGROUND (w, findex) :
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1539 FACE_BACKGROUND (Vdefault_face, locale));
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1540
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1541 }
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1542
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1543 if (UNBOUNDP (background_pixmap))
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1544 background_pixmap = Qnil;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1545
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1546 DEVMETH (d, clear_region,
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1547 (locale, d, f, findex, x, y, width, height, fcolor, bcolor, background_pixmap));
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1548 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1549
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1550 /****************************************************************************
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1551 redisplay_clear_clipped_region
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1552
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1553 Clear the area in the dest display_box not covered by the src
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1554 display_glyph_area using the given face. This is a common occurance
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1555 for images shorter than the display line. Clipping can be played
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1556 around with by altering these. glyphsrc should be normalized.
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1557 ****************************************************************************/
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1558 static void
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1559 redisplay_clear_clipped_region (Lisp_Object window, face_index findex,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1560 struct display_box* dest, struct display_glyph_area* glyphsrc,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1561 int fullheight_p, Lisp_Object ignored_subwindow)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1562 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1563 /* assume dest->xpos >= 0 */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1564 int clear_x;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1565 struct frame* f = XFRAME (XWINDOW (window)->frame);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1566
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1567 if (glyphsrc->xoffset > 0)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1568 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1569 clear_x = dest->xpos + glyphsrc->xoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1570 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1571 else
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1572 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1573 clear_x = dest->xpos;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1574 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1575
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1576 /* If we need the whole height cleared then just do it. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1577 if (fullheight_p)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1578 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1579 redisplay_clear_region (window, findex, clear_x, dest->ypos,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1580 glyphsrc->width, dest->height);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1581 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1582 else
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1583 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1584 int yoffset = (glyphsrc->yoffset > 0 ? glyphsrc->yoffset : 0);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1585
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1586 /* We need to make sure that subwindows are unmapped from the
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1587 whole area. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1588 redisplay_unmap_subwindows_except_us (f, clear_x, dest->ypos,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1589 glyphsrc->width, dest->height,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1590 ignored_subwindow);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1591 /* first the top box */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1592 if (yoffset > 0)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1593 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1594 redisplay_clear_region (window, findex, clear_x, dest->ypos,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1595 glyphsrc->width, yoffset);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1596
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1597 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1598 /* Then the bottom box */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1599 if (yoffset + glyphsrc->height < dest->height)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1600 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1601 redisplay_clear_region (window, findex, clear_x,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1602 dest->ypos + yoffset + glyphsrc->height,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1603 glyphsrc->width,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1604 dest->height - (yoffset + glyphsrc->height));
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1605
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1606 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1607 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1608 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1609
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1610 /*****************************************************************************
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1611 redisplay_normalize_glyph_area
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1612 redisplay_normalize_display_box
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1613
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1614 Calculate the visible box for displaying src in dest.
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1615 ****************************************************************************/
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1616 int
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1617 redisplay_normalize_glyph_area (struct display_box* dest,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1618 struct display_glyph_area* glyphsrc)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1619 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1620 if (dest->xpos + glyphsrc->xoffset > dest->xpos + dest->width
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1621 ||
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1622 dest->ypos + glyphsrc->yoffset > dest->ypos + dest->height
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1623 ||
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1624 -glyphsrc->xoffset >= glyphsrc->width
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1625 ||
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1626 -glyphsrc->yoffset >= glyphsrc->height)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1627 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1628 /* It's all clipped out */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1629 return 0;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1630 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1631
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1632 /* Horizontal offsets. This works because xoffset can be -ve as well as +ve */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1633 if (dest->xpos + glyphsrc->xoffset + glyphsrc->width > dest->xpos + dest->width)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1634 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1635 if (glyphsrc->xoffset > 0)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1636 glyphsrc->width = dest->width - glyphsrc->xoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1637 else
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1638 glyphsrc->width = dest->width;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1639 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1640
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1641 if (glyphsrc->xoffset < 0)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1642 glyphsrc->width += glyphsrc->xoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1643
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1644 /* Vertical offsets. This works because yoffset can be -ve as well as +ve */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1645 if (dest->ypos + glyphsrc->yoffset + glyphsrc->height > dest->ypos + dest->height)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1646 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1647 if (glyphsrc->yoffset > 0)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1648 glyphsrc->height = dest->height - glyphsrc->yoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1649 else
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1650 glyphsrc->height = dest->height;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1651 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1652
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1653 if (glyphsrc->yoffset < 0)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1654 glyphsrc->height += glyphsrc->yoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1655
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1656 return 1;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1657 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1658
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1659 static void
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1660 redisplay_normalize_display_box (struct display_box* dest,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1661 struct display_glyph_area* glyphsrc)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1662 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1663 /* Adjust the destination area. At the end of this the destination
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1664 area will exactly enclose the glyph area. The only remaining
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1665 adjustment will be offsets into the glyph area. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1666
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1667 /* Horizontal adjustment. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1668 if (glyphsrc->xoffset > 0)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1669 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1670 dest->xpos += glyphsrc->xoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1671 dest->width -= glyphsrc->xoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1672 glyphsrc->xoffset = 0;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1673 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1674 else
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1675 glyphsrc->xoffset = -glyphsrc->xoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1676
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1677 if (glyphsrc->width < dest->width)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1678 dest->width = glyphsrc->width;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1679
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1680 /* Vertical adjustment. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1681 if (glyphsrc->yoffset > 0)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1682 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1683 dest->ypos += glyphsrc->yoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1684 dest->height -= glyphsrc->yoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1685 glyphsrc->yoffset = 0;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1686 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1687 else
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1688 glyphsrc->yoffset = -glyphsrc->yoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1689
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1690 if (glyphsrc->height < dest->height)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1691 dest->height = glyphsrc->height;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1692 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1693
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1694 /*****************************************************************************
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1695 redisplay_display_boxes_in_window_p
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1696
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1697 Determine whether the require display_glyph_area is completely inside
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1698 the window. 0 means the display_box is not in the window. 1 means the
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1699 display_box and the display_glyph_area are in the window. -1 means
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1700 the display_box is in the window but the display_glyph_area is not.
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1701 ****************************************************************************/
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1702 static int
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1703 redisplay_display_boxes_in_window_p (struct window* w,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1704 struct display_box* db,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1705 struct display_glyph_area* dga)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1706 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1707 int left = WINDOW_TEXT_LEFT (w);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1708 int right = WINDOW_TEXT_RIGHT (w);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1709 int top = WINDOW_TEXT_TOP (w);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1710 int bottom = WINDOW_TEXT_BOTTOM (w);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1711
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1712 if (db->xpos < left || db->ypos < top
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1713 || db->xpos + db->width > right
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1714 || db->ypos + db->height > bottom)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1715 /* We are not displaying in a window at all */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1716 return 0;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1717
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1718 if (db->xpos + dga->xoffset >= left
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1719 &&
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1720 db->ypos + dga->yoffset >= top
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1721 &&
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1722 db->xpos + dga->xoffset + dga->width <= right
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1723 &&
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1724 db->ypos + dga->yoffset + dga->height <= bottom)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1725 return 1;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1726
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1727 return -1;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1728 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1729
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1730 /*****************************************************************************
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1731 redisplay_calculate_display_boxes
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1732
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1733 Convert from rune/display_line co-ordinates to display_box
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1734 co-ordinates.
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1735 ****************************************************************************/
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1736 int
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1737 redisplay_calculate_display_boxes (struct display_line *dl, int xpos,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1738 int xoffset, int start_pixpos, int width,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1739 struct display_box* dest,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1740 struct display_glyph_area* src)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1741 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1742 dest->xpos = xpos;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1743 dest->ypos = DISPLAY_LINE_YPOS (dl);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1744 dest->width = width;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1745 dest->height = DISPLAY_LINE_HEIGHT (dl);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1746
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1747 src->xoffset = -xoffset;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1748 src->yoffset = -dl->top_clip;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1749 src->width = 0;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1750 src->height = 0;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1751
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1752 if (start_pixpos >=0 && start_pixpos > xpos)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1753 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1754 /* Oops, we're asking for a start outside of the displayable
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1755 area. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1756 if (start_pixpos > xpos + width)
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1757 return 0;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1758 dest->xpos = start_pixpos;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1759 dest->width -= (start_pixpos - xpos);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1760 /* Offsets are -ve when we want to clip pixels off the displayed
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1761 glyph. */
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1762 src->xoffset -= (start_pixpos - xpos);
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1763 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1764
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1765 return 1;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1766 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
1767
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1768 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1769 redisplay_clear_top_of_window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1770
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1771 If window is topmost, clear the internal border above it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1772 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1773 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1774 redisplay_clear_top_of_window (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1775 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1776 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1777 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1779 if (!NILP (Fwindow_highest_p (window)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1780 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1781 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1782 int x, y, width, height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1783
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1784 x = w->pixel_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1785 width = w->pixel_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1786
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1787 if (window_is_leftmost (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1788 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1789 x -= FRAME_BORDER_WIDTH (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1790 width += FRAME_BORDER_WIDTH (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1791 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1792 if (window_is_rightmost (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1793 width += FRAME_BORDER_WIDTH (f);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 116
diff changeset
1794
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1795 y = FRAME_TOP_BORDER_START (f) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1796 height = FRAME_BORDER_HEIGHT (f) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1797
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1798 redisplay_clear_region (window, DEFAULT_INDEX, x, y, width, height);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802 /*****************************************************************************
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1803 redisplay_clear_to_window_end
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1804
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1805 Clear the area between ypos1 and ypos2. Each margin area and the
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1806 text area is handled separately since they may each have their own
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1807 background color.
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1808 ****************************************************************************/
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1809 void
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1810 redisplay_clear_to_window_end (struct window *w, int ypos1, int ypos2)
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1811 {
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1812 struct frame *f = XFRAME (w->frame);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1813 struct device *d = XDEVICE (f->device);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1814
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1815 if (HAS_DEVMETH_P (d, clear_to_window_end))
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1816 DEVMETH (d, clear_to_window_end, (w, ypos1, ypos2));
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1817 else
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1818 {
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1819 int height = ypos2 - ypos1;
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1820
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1821 if (height)
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1822 {
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1823 Lisp_Object window;
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1824 int bflag = 0 ; /* (window_needs_vertical_divider (w) ? 0 : 1);*/
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1825 layout_bounds bounds;
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1826
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1827 bounds = calculate_display_line_boundaries (w, bflag);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1828 XSETWINDOW (window, w);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1829
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1830 if (window_is_leftmost (w))
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1831 redisplay_clear_region (window, DEFAULT_INDEX, FRAME_LEFT_BORDER_START (f),
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1832 ypos1, FRAME_BORDER_WIDTH (f), height);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1833
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1834 if (bounds.left_in - bounds.left_out > 0)
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1835 redisplay_clear_region (window,
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1836 get_builtin_face_cache_index (w, Vleft_margin_face),
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1837 bounds.left_out, ypos1,
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1838 bounds.left_in - bounds.left_out, height);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1839
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1840 if (bounds.right_in - bounds.left_in > 0)
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1841 redisplay_clear_region (window,
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1842 DEFAULT_INDEX,
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1843 bounds.left_in, ypos1,
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1844 bounds.right_in - bounds.left_in, height);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1845
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1846 if (bounds.right_out - bounds.right_in > 0)
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1847 redisplay_clear_region (window,
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1848 get_builtin_face_cache_index (w, Vright_margin_face),
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1849 bounds.right_in, ypos1,
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1850 bounds.right_out - bounds.right_in, height);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1851
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1852 if (window_is_rightmost (w))
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1853 redisplay_clear_region (window, DEFAULT_INDEX, FRAME_RIGHT_BORDER_START (f),
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1854 ypos1, FRAME_BORDER_WIDTH (f), height);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1855 }
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1856 }
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1857 }
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1858
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1859 /*****************************************************************************
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1860 redisplay_clear_bottom_of_window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1862 Clear window from right below the last display line to right above
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1863 the modeline. The calling function can limit the area actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864 erased by setting min_start and/or max_end to positive values.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1865 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1866 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1867 redisplay_clear_bottom_of_window (struct window *w, display_line_dynarr *ddla,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1868 int min_start, int max_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1869 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1870 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1871 int ypos1, ypos2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1872 int ddla_len = Dynarr_length (ddla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1873
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1874 ypos2 = WINDOW_TEXT_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1875 #ifdef HAVE_SCROLLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1876 /* This adjustment is to catch the intersection of any scrollbars. */
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 272
diff changeset
1877 if (f->windows_structure_changed && NILP (w->scrollbar_on_top_p))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1878 ypos2 += window_scrollbar_height (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1879 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1880
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1881 if (ddla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1882 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1883 if (ddla_len == 1 && Dynarr_atp (ddla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1884 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1885 ypos1 = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1886 #ifdef HAVE_SCROLLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1887 /* This adjustment is to catch the intersection of any scrollbars. */
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 272
diff changeset
1888 if (f->windows_structure_changed && !NILP (w->scrollbar_on_top_p))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1889 ypos1 -= window_scrollbar_height (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1890 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1891 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1892 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1893 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1894 struct display_line *dl = Dynarr_atp (ddla, ddla_len - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1895 ypos1 = dl->ypos + dl->descent - dl->clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1896 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1897 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1898 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1899 ypos1 = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1900
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1901 /* #### See if this can be made conditional on the frame
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1902 changing size. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1903 if (MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1904 ypos2 += FRAME_BORDER_HEIGHT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1905
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1906 if (min_start >= 0 && ypos1 < min_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1907 ypos1 = min_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1908 if (max_end >= 0 && ypos2 > max_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1909 ypos2 = max_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1910
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1911 if (ypos2 <= ypos1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1912 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1913
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
1914 redisplay_clear_to_window_end (w, ypos1, ypos2);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1915 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1916
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1917 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1918 redisplay_update_line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1919
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1920 This is used during incremental updates to update a single line and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1921 correct the offsets on all lines below it. At the moment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1922 update_values is false if we are only updating the modeline.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1923 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1924 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1925 redisplay_update_line (struct window *w, int first_line, int last_line,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1926 int update_values)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1927 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1928 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1929 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1930
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1931 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1932 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1933
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
1934 DEVMETH (d, output_begin, (d));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1935
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1936 while (first_line <= last_line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1937 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1938 Charcount old_len = (Dynarr_atp (cdla, first_line)->end_bufpos -
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1939 Dynarr_atp (cdla, first_line)->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1940 Charcount new_len = (Dynarr_atp (ddla, first_line)->end_bufpos -
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1941 Dynarr_atp (ddla, first_line)->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1942
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1943 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1944
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1945 /* Output the changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1946 output_display_line (w, cdla, ddla, first_line, -1, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1947
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1948 /* Update the offsets. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1949 if (update_values)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1950 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1951 int cur_line = first_line + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1952 while (cur_line < Dynarr_length (cdla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1953 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1954 Dynarr_atp (cdla, cur_line)->offset += (new_len - old_len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1955 Dynarr_atp (ddla, cur_line)->offset += (new_len - old_len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1956 cur_line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1957 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1958 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1959
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1960 /* Update the window_end_pos and other settings. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1961 if (update_values)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1962 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1963 w->window_end_pos[CURRENT_DISP] -= (new_len - old_len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1964
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1965 if (Dynarr_atp (ddla, first_line)->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1966 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1967 w->last_point_x[CURRENT_DISP] = w->last_point_x[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1968 w->last_point_y[CURRENT_DISP] = w->last_point_y[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1969 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1970 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1971
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1972 first_line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1973 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1974
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1975 /* Update the window max line length. We have to scan the entire
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1976 set of display lines otherwise we might not detect if the max is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1977 supposed to shrink. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1978 if (update_values)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1979 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1980 int line = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1981
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1982 w->max_line_len = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1983 while (line < Dynarr_length (ddla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1984 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1985 struct display_line *dl = Dynarr_atp (ddla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1986
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1987 if (!dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1988 w->max_line_len = max (dl->num_chars, w->max_line_len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1989
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1990 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1991 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1992 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1993
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1994 w->last_modified[CURRENT_DISP] = w->last_modified[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1995 w->last_facechange[CURRENT_DISP] = w->last_facechange[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1996 Fset_marker (w->last_point[CURRENT_DISP],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1997 Fmarker_position (w->last_point[DESIRED_DISP]), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1998 Fset_marker (w->last_start[CURRENT_DISP],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1999 Fmarker_position (w->last_start[DESIRED_DISP]), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2001 /* We don't bother updating the vertical scrollbars here. This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2002 gives us a performance increase while having minimal loss of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2003 quality to the scrollbar slider size and position since when this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2004 function is called we know that the changes to the buffer were
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2005 very localized. We have to update the horizontal scrollbars,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2006 though, because this routine could cause a change which has a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2007 larger impact on their sizing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2008 /* #### See if we can get away with only calling this if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2009 max_line_len is greater than the window_char_width. */
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 185
diff changeset
2010 #if defined(HAVE_SCROLLBARS) && defined(HAVE_X_WINDOWS)
82
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
2011 {
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
2012 extern int stupid_vertical_scrollbar_drag_hack;
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
2013
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
2014 update_window_scrollbars (w, NULL, 1, stupid_vertical_scrollbar_drag_hack);
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
2015 stupid_vertical_scrollbar_drag_hack = 1;
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
2016 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2017 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2018
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2019 /* This has to be done after we've updated the values. We don't
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2020 call output_end for tty frames. Redisplay will do this after all
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2021 tty windows have been updated. This cuts down on cursor
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2022 flicker. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2023 if (FRAME_TTY_P (f))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2024 redisplay_redraw_cursor (f, 0);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2025 else
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2026 DEVMETH (d, output_end, (d));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2027 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2028
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2029 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2030 redisplay_output_window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2031
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2032 For the given window W, ensure that the current display lines are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2033 equal to the desired display lines, outputing changes as necessary.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2034
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2035 #### Fuck me. This just isn't going to cut it for tty's. The output
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2036 decisions for them must be based on the contents of the entire frame
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2037 because that is how the available output capabilities think. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2038 solution is relatively simple. Create redisplay_output_frame. This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2039 will basically merge all of the separate window display structs into
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2040 a single one for the frame. This combination structure will be able
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2041 to be passed to the same output_display_line which works for windows
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2042 on X frames and the right things will happen. It just takes time to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2043 do.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2044 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2045 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2046 redisplay_output_window (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2047 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2048 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2049 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2050
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2051 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2052 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2053
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2054 int cdla_len = Dynarr_length (cdla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2055 int ddla_len = Dynarr_length (ddla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2056
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2057 int line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2058 int need_to_clear_bottom = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2059 int need_to_clear_start = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2060 int need_to_clear_end = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2061
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2062 /* Backgrounds may have changed or windows may have gone away
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2063 leaving dividers lying around. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2064 if (f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2065 || f->windows_structure_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2066 || w->shadow_thickness_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2067 need_to_clear_bottom = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2068
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2069 /* The first thing we do is determine if we are going to need to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2070 clear the bottom of the window. We only need to do this if the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2071 bottom of the current display lines is below the bottom of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2072 desired display lines. Note that the number of lines is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2073 irrelevant. Only the position matters. We also clear to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2074 bottom of the window if the modeline has shifted position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2075 /* #### We can't blindly not clear the bottom if f->clear is true
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2076 since there might be a window-local background. However, for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2077 those cases where there isn't, clearing the end of the window in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2078 this case sucks. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2079 if (!need_to_clear_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2080 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2081 struct display_line *cdl, *ddl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2082
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2083 /* If the modeline has changed position or size, clear the bottom
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2084 of the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2085 if (!need_to_clear_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2086 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2087 cdl = ddl = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2088
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2089 if (cdla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2090 cdl = Dynarr_atp (cdla, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2091 if (ddla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2092 ddl = Dynarr_atp (ddla, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2093
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2094 if (!cdl || !ddl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2095 need_to_clear_bottom = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2096 else if ((!cdl->modeline && ddl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2097 || (cdl->modeline && !ddl->modeline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2098 need_to_clear_bottom = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2099 else if (cdl->ypos != ddl->ypos ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2100 cdl->ascent != ddl->ascent ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2101 cdl->descent != ddl->descent ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2102 cdl->clip != ddl->clip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2103 need_to_clear_bottom = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2104
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2105 /* #### This kludge is to make sure the modeline shadows get
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2106 redrawn if the modeline position shifts. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2107 if (need_to_clear_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2108 w->shadow_thickness_changed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2109 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2111 if (!need_to_clear_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2112 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2113 cdl = ddl = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2114
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2115 if (cdla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2116 cdl = Dynarr_atp (cdla, cdla_len - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2117 if (ddla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2118 ddl = Dynarr_atp (ddla, ddla_len - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2119
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2120 if (!cdl || !ddl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2121 need_to_clear_bottom = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2122 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2123 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2124 int cdl_bottom, ddl_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2125
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2126 cdl_bottom = cdl->ypos + cdl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2127 ddl_bottom = ddl->ypos + ddl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2128
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2129 if (cdl_bottom > ddl_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2130 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2131 need_to_clear_bottom = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2132 need_to_clear_start = ddl_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2133 need_to_clear_end = cdl_bottom;
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 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2139 /* Perform any output initialization. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2140 DEVMETH (d, output_begin, (d));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2141
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2142 /* If the window's structure has changed clear the internal border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2143 above it if it is topmost (the function will check). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2144 if (f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2145 redisplay_clear_top_of_window (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2146
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2147 /* Output each line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2148 for (line = 0; line < Dynarr_length (ddla); line++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2149 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2150 output_display_line (w, cdla, ddla, line, -1, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2151 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2152
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2153 /* If the number of display lines has shrunk, adjust. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2154 if (cdla_len > ddla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2155 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2156 Dynarr_length (cdla) = ddla_len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2157 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2158
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2159 /* Output a vertical divider between windows, if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2160 if (window_needs_vertical_divider (w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2161 && (f->windows_structure_changed || f->clear))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2162 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2163 DEVMETH (d, output_vertical_divider, (w, f->windows_structure_changed));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2164 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2165
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2166 /* Clear the rest of the window, if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2167 if (need_to_clear_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2168 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2169 redisplay_clear_bottom_of_window (w, ddla, need_to_clear_start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2170 need_to_clear_end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2171 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2172
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2173 w->window_end_pos[CURRENT_DISP] = w->window_end_pos[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2174 Fset_marker (w->start[CURRENT_DISP],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2175 make_int (marker_position (w->start[DESIRED_DISP])),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2176 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2177 Fset_marker (w->pointm[CURRENT_DISP],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2178 make_int (marker_position (w->pointm[DESIRED_DISP])),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2179 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2180 w->last_modified[CURRENT_DISP] = w->last_modified[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2181 w->last_facechange[CURRENT_DISP] = w->last_facechange[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2182 Fset_marker (w->last_start[CURRENT_DISP],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2183 Fmarker_position (w->last_start[DESIRED_DISP]), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2184 Fset_marker (w->last_point[CURRENT_DISP],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2185 Fmarker_position (w->last_point[DESIRED_DISP]), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2186 w->last_point_x[CURRENT_DISP] = w->last_point_x[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2187 w->last_point_y[CURRENT_DISP] = w->last_point_y[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2188 w->shadow_thickness_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2190 set_window_display_buffer (w, XBUFFER (w->buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2191 find_window_mirror (w)->truncate_win = window_truncation_on (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2192
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2193 /* Overkill on invalidating the cache. It is very bad for it to not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2194 get invalidated when it should be. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2195 INVALIDATE_DEVICE_PIXEL_TO_GLYPH_CACHE (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2196
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2197 /* We don't call output_end for tty frames. Redisplay will do this
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2198 after all tty windows have been updated. This cuts down on
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2199 cursor flicker. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2200 if (FRAME_TTY_P (f))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2201 redisplay_redraw_cursor (f, 0);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2202 else
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 408
diff changeset
2203 DEVMETH (d, output_end, (d));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2204
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2205 #ifdef HAVE_SCROLLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2206 update_window_scrollbars (w, NULL, !MINI_WINDOW_P (w), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2207 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2208 }
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2209
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2210 /*****************************************************************************
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2211 bevel_modeline
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2212
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2213 Draw a 3d border around the modeline on window W.
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2214 ****************************************************************************/
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2215 void
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2216 bevel_modeline (struct window *w, struct display_line *dl)
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2217 {
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2218 struct frame *f = XFRAME (w->frame);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2219 struct device *d = XDEVICE (f->device);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2220 int x, y, width, height;
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2221 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
2222 enum edge_style style;
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2223
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2224 x = WINDOW_MODELINE_LEFT (w);
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2225 width = WINDOW_MODELINE_RIGHT (w) - x;
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2226 y = dl->ypos - dl->ascent - shadow_thickness;
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2227 height = dl->ascent + dl->descent + 2 * shadow_thickness;
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2228
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2229 if (XINT (w->modeline_shadow_thickness) < 0)
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
2230 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
2231 style = EDGE_BEVEL_IN;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
2232 }
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
2233 else
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
2234 {
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
2235 style = EDGE_BEVEL_OUT;
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
2236 }
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2237
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2238 MAYBE_DEVMETH (d, bevel_area,
424
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
2239 (w, MODELINE_INDEX, x, y, width, height, shadow_thickness,
11054d720c21 Import from CVS: tag r21-2-20
cvs
parents: 422
diff changeset
2240 EDGE_ALL, style));
422
95016f13131a Import from CVS: tag r21-2-19
cvs
parents: 412
diff changeset
2241 }