annotate src/redisplay-output.c @ 263:727739f917cb r20-5b30

Import from CVS: tag r20-5b30
author cvs
date Mon, 13 Aug 2007 10:24:41 +0200
parents 41ff10fd062f
children 8efd647ea9ca
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.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 under the terms of the GNU General Public License as published by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 Free Software Foundation; either version 2, or (at your option) any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 along with XEmacs; see the file COPYING. If not, write to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 Boston, MA 02111-1307, USA. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 /* Synched up with: Not in FSF. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 /* This file has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 /* Author: Chuck Thompson */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 #include <config.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 #include "lisp.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 #include "debug.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 #include "buffer.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 #include "window.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 #include "frame.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 #include "device.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 #include "glyphs.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 #include "redisplay.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 #include "faces.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 #include "sysdep.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 static int compare_runes (struct window *w, struct rune *crb,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 struct rune *drb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 static void redraw_cursor_in_window (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 int run_end_begin_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 void redisplay_output_window (struct window *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 sync_rune_structs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 Synchronize the given rune blocks.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 sync_rune_structs (struct window *w, rune_dynarr *cra, rune_dynarr *dra)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 int rune_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 int max_move = ((Dynarr_length (dra) > Dynarr_largest (cra))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 ? Dynarr_largest (cra)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 : Dynarr_length (dra));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 if (max_move)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 /* #### Doing this directly breaks the encapsulation. But, the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 running time of this function has a measurable impact on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 redisplay performance so avoiding all excess overhead is a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 good thing. Is all of this true? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 memcpy (cra->base, dra->base, sizeof (struct rune) * max_move);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 Dynarr_set_size (cra, max_move);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 Dynarr_reset (cra);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 for (rune_elt = max_move; rune_elt < Dynarr_length (dra); rune_elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 struct rune rb, *crb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 struct rune *drb = Dynarr_atp (dra, rune_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 crb = &rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 memcpy (crb, drb, sizeof (struct rune));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 Dynarr_add (cra, *crb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 sync_display_line_structs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 For the given LINE in window W, make the current display line equal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 the desired display line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 sync_display_line_structs (struct window *w, int line, int do_blocks,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 display_line_dynarr *cdla,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 display_line_dynarr *ddla)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 int cdla_len = Dynarr_length (cdla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 struct display_line dl, *clp, *dlp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 int db_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 dlp = Dynarr_atp (ddla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 if (line >= Dynarr_largest (cdla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 clp = &dl;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 116
diff changeset
105 clp->display_blocks = Dynarr_new (display_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 clp = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 if (clp->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 Dynarr_reset (clp->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 if (clp->left_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 Dynarr_free (clp->left_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 clp->left_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 if (clp->right_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 Dynarr_free (clp->right_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 clp->right_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 display_block_dynarr *tdb = clp->display_blocks;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 memcpy (clp, dlp, sizeof (struct display_line));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 clp->display_blocks = tdb;
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 clp->right_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 if (!do_blocks && line >= cdla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134 Dynarr_add (cdla, *clp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 for (db_elt = 0; db_elt < Dynarr_length (dlp->display_blocks); db_elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 struct display_block db, *cdb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141 struct display_block *ddb = Dynarr_atp (dlp->display_blocks, db_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143 if (db_elt >= Dynarr_largest (clp->display_blocks))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 cdb = &db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 memcpy (cdb, ddb, sizeof (struct display_block));
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 116
diff changeset
147 cdb->runes = Dynarr_new (rune);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 Dynarr_add (clp->display_blocks, *cdb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152 rune_dynarr *tr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154 cdb = Dynarr_atp (clp->display_blocks, db_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
155 tr = cdb->runes;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156 memcpy (cdb, ddb, sizeof (struct display_block));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 cdb->runes = tr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 Dynarr_increment (clp->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 sync_rune_structs (w, cdb->runes, ddb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 if (line >= cdla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 Dynarr_add (cdla, *clp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 compare_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 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
172 return true otherwise return false.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175 compare_runes (struct window *w, struct rune *crb, struct rune *drb)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 /* Do not compare the values of bufpos and endpos. They do not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 affect the display characteristics. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 if ((crb->findex != drb->findex) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 (WINDOW_FACE_CACHEL_DIRTY (w, drb->findex)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 else if (crb->xpos != drb->xpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 else if (crb->width != drb->width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 else if (crb->cursor_type != drb->cursor_type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 else if (crb->type != drb->type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 else if (crb->type == RUNE_CHAR &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 (crb->object.chr.ch != drb->object.chr.ch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 else if (crb->type == RUNE_DGLYPH &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 (!EQ (crb->object.dglyph.glyph, drb->object.dglyph.glyph) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 !EQ (crb->object.dglyph.extent, drb->object.dglyph.extent) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 crb->object.dglyph.xoffset != drb->object.dglyph.xoffset))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 else if (crb->type == RUNE_HLINE &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 (crb->object.hline.thickness != drb->object.hline.thickness ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 crb->object.hline.yoffset != drb->object.hline.yoffset))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 get_next_display_block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210 Return the next display starting at or overlapping START_POS. Return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 the start of the next region in NEXT_START.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 get_next_display_block (layout_bounds bounds, display_block_dynarr *dba,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215 int start_pos, int *next_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
217 int next_display_block = NO_BLOCK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 int priority = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219 int block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 /* If we don't find a display block covering or starting at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222 start_pos, then we return the starting point of the next display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223 block or the next division boundary, whichever is closer to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224 start_pos. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225 if (next_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227 if (start_pos >= bounds.left_out && start_pos < bounds.left_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228 *next_start = bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 else if (start_pos < bounds.left_white)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 *next_start = bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 else if (start_pos < bounds.right_white)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 *next_start = bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 else if (start_pos < bounds.right_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 *next_start = bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 else if (start_pos <= bounds.right_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 *next_start = bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 for (block = 0; block < Dynarr_length (dba); block++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 struct display_block *db = Dynarr_atp (dba, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 if (db->start_pos <= start_pos && db->end_pos > start_pos)
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 ((int) db->type > priority)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 priority = db->type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 next_display_block = block;
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 *next_start = db->end_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 else if (next_start && db->start_pos > start_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 if (db->start_pos < *next_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 *next_start = db->start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 return next_display_block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 get_cursor_size_and_location
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 Return the information defining the pixel location of the cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 get_cursor_size_and_location (struct window *w, struct display_block *db,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 int cursor_location,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 int *cursor_start, int *cursor_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 int *cursor_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 struct rune *rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 Lisp_Object window = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 int defheight, defwidth;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 if (Dynarr_length (db->runes) <= cursor_location)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 rb = Dynarr_atp (db->runes, cursor_location);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 *cursor_start = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 default_face_height_and_width (window, &defheight, &defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 *cursor_height = defheight;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 if (rb->type == RUNE_BLANK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 *cursor_width = defwidth;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 *cursor_width = rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 compare_display_blocks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 Given two display blocks, output only those areas where they differ.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 compare_display_blocks (struct window *w, struct display_line *cdl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 struct display_line *ddl, int c_block, int d_block,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305 int start_pixpos, int cursor_start, int cursor_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306 int cursor_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 struct display_block *cdb, *ddb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312 int start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 int stop_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 int force = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 int block_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 cdb = Dynarr_atp (cdl->display_blocks, c_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318 ddb = Dynarr_atp (ddl->display_blocks, d_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 assert (cdb->type == ddb->type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 start_pos = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323 stop_pos = min (Dynarr_length (cdb->runes), Dynarr_length (ddb->runes));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325 block_end =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 (!Dynarr_length (ddb->runes)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327 ? 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 : (Dynarr_atp (ddb->runes, Dynarr_length (ddb->runes) - 1)->xpos +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329 Dynarr_atp (ddb->runes, Dynarr_length (ddb->runes) - 1)->width));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331 /* If the new block type is not text and the cursor status is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332 changing and it overlaps the position of this block then force a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333 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
334 updated properly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 if (ddb->type != TEXT
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
336 #if 0
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
337 /* 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
338 * 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
339 * 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
340 * I've replaced it with the more conservative test below.
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
341 * -dkindred@cs.cmu.edu 23-Mar-1997 */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 && ((cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 && (ddl->cursor_elt == -1 ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345 (cursor_start
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 && cursor_width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 && (cursor_start + cursor_width) >= start_pixpos
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
348 && cursor_start <= block_end))
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
349 #else
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
350 && (cdl->cursor_elt != ddl->cursor_elt)
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
351 #endif
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 82
diff changeset
352 )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353 force = 1;
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 (f->windows_structure_changed ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 f->faces_changed ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357 cdl->ypos != ddl->ypos ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 cdl->ascent != ddl->ascent ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 cdl->descent != ddl->descent ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360 cdl->clip != ddl->clip ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361 force)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
363 start_pos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
364 force = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 int elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 while (start_pos < 0 && elt < stop_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 if (!compare_runes (w, Dynarr_atp (cdb->runes, elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 Dynarr_atp (ddb->runes, elt)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 start_pos = elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 /* If nothing has changed in the area where the blocks overlap, but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 there are new blocks in the desired block, then adjust the start
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385 point accordingly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 if (elt == stop_pos && stop_pos < Dynarr_length (ddb->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 start_pos = stop_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390 if (start_pos >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 if ((Dynarr_length (ddb->runes) != Dynarr_length (cdb->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393 || force)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 stop_pos = Dynarr_length (ddb->runes);
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 /* If the lines have the same number of runes and we are not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400 forcing a full redraw because the display line has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 changed position then we try and optimize how much of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 line we actually redraw by scanning backwards from the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403 end for the first changed rune. This optimization is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 almost always triggered by face changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406 int elt = Dynarr_length (ddb->runes) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 while (elt > start_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 if (!compare_runes (w, Dynarr_atp (cdb->runes, elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 Dynarr_atp (ddb->runes, elt)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 stop_pos = elt + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 DEVMETH (d, output_display_block, (w, ddl, d_block, start_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 stop_pos, start_pixpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 cursor_start, cursor_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422 cursor_height));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 clear_left_border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 Clear the lefthand outside border.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 clear_left_border (struct window *w, int y, int height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 DEVMETH (d, clear_region, (window, DEFAULT_INDEX,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 FRAME_LEFT_BORDER_START (f), y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 FRAME_BORDER_WIDTH (f), height));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448 clear_right_border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 Clear the righthand outside border.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 clear_right_border (struct window *w, int y, int height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460 DEVMETH (d, clear_region, (window, DEFAULT_INDEX,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 FRAME_RIGHT_BORDER_START (f),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 y, FRAME_BORDER_WIDTH (f), height));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466 output_display_line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 Ensure that the contents of the given display line is correct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 on-screen. The force_ parameters are used by redisplay_move_cursor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 to correctly update cursor locations and only cursor locations.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 output_display_line (struct window *w, display_line_dynarr *cdla,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 display_line_dynarr *ddla, int line, int force_start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 int force_end)
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 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 struct buffer *old_b = window_display_buffer (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 struct display_line *cdl, *ddl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483 display_block_dynarr *cdba, *ddba;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 int start_pixpos, end_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 int cursor_start, cursor_width, cursor_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 int force = (force_start >= 0 || force_end >= 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 int clear_border = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489 int must_sync = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 if (cdla && line < Dynarr_length (cdla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 cdl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 cdba = cdl->display_blocks;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 cdl = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 cdba = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 ddl = Dynarr_atp (ddla, line); /* assert line < Dynarr_length (ddla) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 ddba = ddl->display_blocks;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 if (force_start >= 0 && force_start >= ddl->bounds.left_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 start_pixpos = force_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 start_pixpos = ddl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 if (force_end >= 0 && force_end < ddl->bounds.right_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 end_pixpos = force_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 end_pixpos = ddl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 /* Get the cursor parameters. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 if (ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 /* If the lines cursor parameter is not -1 then it indicates
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 which rune in the TEXT block contains the cursor. This means
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 that there must be at least one display block. The TEXT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 block, if present, must always be the first display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 assert (Dynarr_length (ddba) != 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 db = Dynarr_atp (ddba, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 assert (db->type == TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 get_cursor_size_and_location (w, db, ddl->cursor_elt, &cursor_start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 &cursor_width, &cursor_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 cursor_start = cursor_width = cursor_height = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 /* The modeline should only have a single block and it had better be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 a TEXT block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 if (ddl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 /* The shadow thickness check is necesssary if only the sign of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 the size changed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 if (cdba && !w->shadow_thickness_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 must_sync |= compare_display_blocks (w, cdl, ddl, 0, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 start_pixpos, 0, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 DEVMETH (d, output_display_block, (w, ddl, 0, 0, -1, start_pixpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 0, 0, 0));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 must_sync = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 if (must_sync)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 clear_border = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 while (!ddl->modeline && start_pixpos < end_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 int block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 int next_start_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 block = get_next_display_block (ddl->bounds, ddba, start_pixpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565 &next_start_pixpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 /* If we didn't find a block then we should blank the area
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 between start_pos and next_start if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 if (block == NO_BLOCK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 /* We only erase those areas which were actually previously
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 covered by a display block unless the window structure
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 changed. In that case we clear all areas since the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 structures may actually represent a different buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 while (start_pixpos < next_start_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 int block_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 int old_block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 if (cdba)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 old_block = get_next_display_block (ddl->bounds, cdba,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 start_pixpos, &block_end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 old_block = NO_BLOCK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 block_end = next_start_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589 if (!cdba || old_block != NO_BLOCK || b != old_b ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 f->windows_structure_changed ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591 f->faces_changed ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 force ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 (cdl && (cdl->ypos != ddl->ypos ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594 cdl->ascent != ddl->ascent ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595 cdl->descent != ddl->descent ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 cdl->clip != ddl->clip)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598 int x, y, width, height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 Lisp_Object face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 must_sync = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 x = start_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 y = ddl->ypos - ddl->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 width = min (next_start_pixpos, block_end) - x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 height = ddl->ascent + ddl->descent - ddl->clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 if (x < ddl->bounds.left_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 face = Vleft_margin_face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 else if (x < ddl->bounds.right_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 face = Vdefault_face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 else if (x < ddl->bounds.right_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 face = Vright_margin_face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 face = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616 if (!NILP (face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 /* Clear the empty area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 DEVMETH (d, clear_region,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 (window, get_builtin_face_cache_index (w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 face),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 x, y, width, height));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 /* Mark that we should clear the border. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629 necessary because italic fonts may leave
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 droppings in the border. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 clear_border = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635 start_pixpos = min (next_start_pixpos, block_end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 struct display_block *cdb, *ddb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 int block_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 int old_block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 if (cdba)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 old_block = get_next_display_block (ddl->bounds, cdba,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 start_pixpos, &block_end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 old_block = NO_BLOCK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 ddb = Dynarr_atp (ddba, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651 cdb = (old_block != NO_BLOCK ? Dynarr_atp (cdba, old_block) : 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 /* If there was formerly no block over the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 region or if it was a block of a different type, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655 output the entire ddb. Otherwise, compare cdb and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656 ddb and output only the changed region. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 if (!force && cdb && ddb->type == cdb->type && b == old_b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659 must_sync |= compare_display_blocks (w, cdl, ddl, old_block,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660 block, start_pixpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661 cursor_start, cursor_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662 cursor_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 int first_elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 int last_elt = -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 for (elt = 0; elt < Dynarr_length (ddb->runes); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 struct rune *rb = Dynarr_atp (ddb->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 if (start_pixpos >= rb->xpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 && start_pixpos < rb->xpos + rb->width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 first_elt = elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 if (end_pixpos > rb->xpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 && end_pixpos <= rb->xpos + rb->width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681 last_elt = elt + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 if (last_elt > Dynarr_length (ddb->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 last_elt = Dynarr_length (ddb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688 must_sync = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689 DEVMETH (d, output_display_block, (w, ddl, block, first_elt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 last_elt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 start_pixpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 cursor_start, cursor_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 cursor_height));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 start_pixpos = next_start_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700 /* Clear the internal border if we are next to it and the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 structure or frame size has changed or if something caused
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 clear_border to be tripped. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703 /* #### Doing this on f->clear sucks but is necessary because of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704 window-local background values. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 if (f->windows_structure_changed || f->faces_changed || clear_border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 || f->clear)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 int y = ddl->ypos - ddl->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709 int height = ddl->ascent + ddl->descent - ddl->clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 if (ddl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 y -= MODELINE_SHADOW_THICKNESS (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 height += (2 * MODELINE_SHADOW_THICKNESS (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717 if (window_is_leftmost (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 clear_left_border (w, y, height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719 if (window_is_rightmost (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 clear_right_border (w, y, height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723 if (cdla)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724 sync_display_line_structs (w, line, must_sync, cdla, ddla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 }
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 redisplay_move_cursor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730 For the given window W, move the cursor to NEW_POINT. Returns a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731 boolean indicating success or failure.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734 #define ADJ_BUFPOS (rb->bufpos + dl->offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 #define ADJ_ENDPOS (rb->endpos + dl->offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
736
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 redisplay_move_cursor (struct window *w, Bufpos new_point, int no_output_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744 struct display_line *dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 struct rune *rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 int x = w->last_point_x[CURRENT_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 int y = w->last_point_y[CURRENT_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749
263
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
750 extern int cursor_in_echo_area;
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
751
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
752 /*
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
753 * Bail if cursor_in_echo_area is non-zero and we're fiddling
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
754 * with the cursor in a minibuffer window, since that is a
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
755 * special case that is handled elsewhere and this function
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
756 * need not handle it. Return 1 so the caller will assume we
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
757 * succeeded.
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
758 */
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
759 if (cursor_in_echo_area && MINI_WINDOW_P (w))
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
760 return 1;
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
761
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762 if (y < 0 || y >= Dynarr_length (cla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765 dl = Dynarr_atp (cla, y);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 db = get_display_block_from_line (dl, TEXT);
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 (x < 0 || x >= Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771 rb = Dynarr_atp (db->runes, x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 if (rb->cursor_type == CURSOR_OFF)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775 else if (ADJ_BUFPOS == new_point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
776 || (ADJ_ENDPOS && (new_point >= ADJ_BUFPOS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 && (new_point <= ADJ_ENDPOS)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 w->last_point_x[CURRENT_DISP] = x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780 w->last_point_y[CURRENT_DISP] = y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781 Fset_marker (w->last_point[CURRENT_DISP], make_int (ADJ_BUFPOS),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 dl->cursor_elt = x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788 DEVMETH (d, output_begin, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 /* #### This is a gross kludge. Cursor handling is such a royal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791 pain in the ass. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792 if (rb->type == RUNE_DGLYPH &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793 (EQ (rb->object.dglyph.glyph, Vtruncation_glyph) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794 EQ (rb->object.dglyph.glyph, Vcontinuation_glyph)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
795 rb->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
796 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
797 rb->cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798 dl->cursor_elt = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
799 output_display_line (w, 0, cla, y, rb->xpos, rb->xpos + rb->width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
801
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
802 w->last_point_x[CURRENT_DISP] = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803 w->last_point_y[CURRENT_DISP] = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804 Fset_marker (w->last_point[CURRENT_DISP], Qnil, w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 /* If this isn't the selected frame, then erasing the old cursor is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807 all we actually had to do. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 if (w != XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 if (!no_output_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 DEVMETH (d, output_end, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816 /* This should only occur in the minibuffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 if (new_point == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 w->last_point_x[CURRENT_DISP] = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 w->last_point_y[CURRENT_DISP] = y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821 Fset_marker (w->last_point[CURRENT_DISP], Qzero, w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 rb = Dynarr_atp (db->runes, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 rb->cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 dl->cursor_elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 output_display_line (w, 0, cla, y, rb->xpos, rb->xpos + rb->width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 if (!no_output_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830 DEVMETH (d, output_end, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 int cur_rb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 int first = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 int cur_dl, up;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 if (ADJ_BUFPOS < new_point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 up = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 cur_rb = x + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 cur_dl = y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845 else /* (rb->bufpos + dl->offset) > new_point */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847 up = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849 if (!x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 cur_dl = y - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 first = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856 cur_rb = x - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 cur_dl = y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 first = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 while ((up ? (cur_dl < Dynarr_length (cla)) : (cur_dl >= 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 dl = Dynarr_atp (cla, cur_dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867 if (!up && !first)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 cur_rb = Dynarr_length (db->runes) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 while ((!scroll_on_clipped_lines || !dl->clip) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 (up ? (cur_rb < Dynarr_length (db->runes)) : (cur_rb >= 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 rb = Dynarr_atp (db->runes, cur_rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 if (rb->cursor_type != IGNORE_CURSOR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876 && rb->cursor_type != NO_CURSOR &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 (ADJ_BUFPOS == new_point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 || (ADJ_ENDPOS && (new_point >= ADJ_BUFPOS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 && (new_point <= ADJ_BUFPOS))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 rb->cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 dl->cursor_elt = cur_rb;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 116
diff changeset
883
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 output_display_line (w, 0, cla, cur_dl, rb->xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 rb->xpos + rb->width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 w->last_point_x[CURRENT_DISP] = cur_rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 w->last_point_y[CURRENT_DISP] = cur_dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 Fset_marker (w->last_point[CURRENT_DISP],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 make_int (ADJ_BUFPOS), w->buffer);
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 (!no_output_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 DEVMETH (d, output_end, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 (up ? cur_rb++ : cur_rb--);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 (up ? (cur_rb = 0) : (first = 0));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 (up ? cur_dl++ : cur_dl--);
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906 if (!no_output_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907 DEVMETH (d, output_end, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910 #undef ADJ_BUFPOS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911 #undef ADJ_ENDPOS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 redraw_cursor_in_window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 For the given window W, redraw the cursor if it is contained within
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 the window.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 redraw_cursor_in_window (struct window *w, int run_end_begin_meths)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 struct display_line *dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 struct rune *rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 int x = w->last_point_x[CURRENT_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 int y = w->last_point_y[CURRENT_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 if (y < 0 || y >= Dynarr_length (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936 if (MINI_WINDOW_P (w) && f != device_selected_frame (d) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 !is_surrogate_for_selected_frame (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940 dl = Dynarr_atp (dla, y);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941 db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 if (x < 0 || x >= Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 rb = Dynarr_atp (db->runes, x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 /* Don't call the output routine if the block isn't actually the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949 cursor. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 if (rb->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952 if (run_end_begin_meths)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 DEVMETH (d, output_begin, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 output_display_line (w, 0, dla, y, rb->xpos, rb->xpos + rb->width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 if (run_end_begin_meths)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958 DEVMETH (d, output_end, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 redisplay_redraw_cursor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 For the given frame F, redraw the cursor on the selected window.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 This is used to update the cursor after focus changes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 redisplay_redraw_cursor (struct frame *f, int run_end_begin_meths)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
263
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
972 extern int cursor_in_echo_area;
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
973
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
974 if (cursor_in_echo_area)
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
975 if (FRAME_HAS_MINIBUF_P (f))
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
976 {
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
977 w = XWINDOW (FRAME_MINIBUF_WINDOW (f));
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
978 }
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
979 else
727739f917cb Import from CVS: tag r20-5b30
cvs
parents: 209
diff changeset
980 return;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 redraw_cursor_in_window (w, run_end_begin_meths);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985 redisplay_clear_top_of_window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987 If window is topmost, clear the internal border above it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 redisplay_clear_top_of_window (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995 if (!NILP (Fwindow_highest_p (window)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 int x, y, width, height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 x = w->pixel_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002 width = w->pixel_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004 if (window_is_leftmost (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006 x -= FRAME_BORDER_WIDTH (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007 width += FRAME_BORDER_WIDTH (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 if (window_is_rightmost (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 width += FRAME_BORDER_WIDTH (f);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 116
diff changeset
1011
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 y = FRAME_TOP_BORDER_START (f) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1013 height = FRAME_BORDER_HEIGHT (f) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 DEVMETH (d, clear_region, (window, DEFAULT_INDEX, x, y, width, height));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 redisplay_clear_bottom_of_window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 Clear window from right below the last display line to right above
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 the modeline. The calling function can limit the area actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 erased by setting min_start and/or max_end to positive values.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1025 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1026 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027 redisplay_clear_bottom_of_window (struct window *w, display_line_dynarr *ddla,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028 int min_start, int max_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1030 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1032 int ypos1, ypos2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1033 int ddla_len = Dynarr_length (ddla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035 ypos2 = WINDOW_TEXT_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036 #ifdef HAVE_SCROLLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1037 /* This adjustment is to catch the intersection of any scrollbars. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1038 if (f->windows_structure_changed && !f->scrollbar_on_top)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1039 ypos2 += window_scrollbar_height (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1041
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042 if (ddla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 if (ddla_len == 1 && Dynarr_atp (ddla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046 ypos1 = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047 #ifdef HAVE_SCROLLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048 /* This adjustment is to catch the intersection of any scrollbars. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1049 if (f->windows_structure_changed && f->scrollbar_on_top)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 ypos1 -= window_scrollbar_height (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 struct display_line *dl = Dynarr_atp (ddla, ddla_len - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056 ypos1 = dl->ypos + dl->descent - dl->clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060 ypos1 = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062 /* #### See if this can be made conditional on the frame
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1063 changing size. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1064 if (MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065 ypos2 += FRAME_BORDER_HEIGHT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1066
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1067 if (min_start >= 0 && ypos1 < min_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068 ypos1 = min_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1069 if (max_end >= 0 && ypos2 > max_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070 ypos2 = max_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072 if (ypos2 <= ypos1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 DEVMETH (d, clear_to_window_end, (w, ypos1, ypos2));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079 redisplay_update_line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081 This is used during incremental updates to update a single line and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082 correct the offsets on all lines below it. At the moment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1083 update_values is false if we are only updating the modeline.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 redisplay_update_line (struct window *w, int first_line, int last_line,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 int update_values)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1091
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 DEVMETH (d, output_begin, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 while (first_line <= last_line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099 Charcount old_len = (Dynarr_atp (cdla, first_line)->end_bufpos -
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100 Dynarr_atp (cdla, first_line)->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 Charcount new_len = (Dynarr_atp (ddla, first_line)->end_bufpos -
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102 Dynarr_atp (ddla, first_line)->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1106 /* Output the changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 output_display_line (w, cdla, ddla, first_line, -1, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1108
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 /* Update the offsets. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110 if (update_values)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 int cur_line = first_line + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 while (cur_line < Dynarr_length (cdla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115 Dynarr_atp (cdla, cur_line)->offset += (new_len - old_len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 Dynarr_atp (ddla, cur_line)->offset += (new_len - old_len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 cur_line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 /* Update the window_end_pos and other settings. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122 if (update_values)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124 w->window_end_pos[CURRENT_DISP] -= (new_len - old_len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126 if (Dynarr_atp (ddla, first_line)->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 w->last_point_x[CURRENT_DISP] = w->last_point_x[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129 w->last_point_y[CURRENT_DISP] = w->last_point_y[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 first_line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136 /* Update the window max line length. We have to scan the entire
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137 set of display lines otherwise we might not detect if the max is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138 supposed to shrink. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139 if (update_values)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 int line = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143 w->max_line_len = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1144 while (line < Dynarr_length (ddla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1145 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146 struct display_line *dl = Dynarr_atp (ddla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148 if (!dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1149 w->max_line_len = max (dl->num_chars, w->max_line_len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155 w->last_modified[CURRENT_DISP] = w->last_modified[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156 w->last_facechange[CURRENT_DISP] = w->last_facechange[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157 Fset_marker (w->last_point[CURRENT_DISP],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158 Fmarker_position (w->last_point[DESIRED_DISP]), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 Fset_marker (w->last_start[CURRENT_DISP],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160 Fmarker_position (w->last_start[DESIRED_DISP]), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 /* We don't bother updating the vertical scrollbars here. This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163 gives us a performance increase while having minimal loss of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164 quality to the scrollbar slider size and position since when this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 function is called we know that the changes to the buffer were
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166 very localized. We have to update the horizontal scrollbars,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 though, because this routine could cause a change which has a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168 larger impact on their sizing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169 /* #### See if we can get away with only calling this if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170 max_line_len is greater than the window_char_width. */
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 185
diff changeset
1171 #if defined(HAVE_SCROLLBARS) && defined(HAVE_X_WINDOWS)
82
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
1172 {
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
1173 extern int stupid_vertical_scrollbar_drag_hack;
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
1174
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
1175 update_window_scrollbars (w, NULL, 1, stupid_vertical_scrollbar_drag_hack);
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
1176 stupid_vertical_scrollbar_drag_hack = 1;
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 70
diff changeset
1177 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180 /* This has to be done after we've updated the values. We don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1181 call output_end for tty frames. Redisplay will do this after all
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182 tty windows have been updated. This cuts down on cursor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1183 flicker. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184 if (FRAME_TTY_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185 redisplay_redraw_cursor (f, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1187 DEVMETH (d, output_end, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1188 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1190 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1191 redisplay_output_window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193 For the given window W, ensure that the current display lines are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194 equal to the desired display lines, outputing changes as necessary.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196 #### 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
1197 decisions for them must be based on the contents of the entire frame
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198 because that is how the available output capabilities think. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199 solution is relatively simple. Create redisplay_output_frame. This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200 will basically merge all of the separate window display structs into
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201 a single one for the frame. This combination structure will be able
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1202 to be passed to the same output_display_line which works for windows
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1203 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
1204 do.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207 redisplay_output_window (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215 int cdla_len = Dynarr_length (cdla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 int ddla_len = Dynarr_length (ddla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218 int line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 int need_to_clear_bottom = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220 int need_to_clear_start = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221 int need_to_clear_end = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223 /* Backgrounds may have changed or windows may have gone away
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 leaving dividers lying around. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 if (f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1226 || f->windows_structure_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227 || w->shadow_thickness_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 need_to_clear_bottom = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230 /* 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
1231 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
1232 bottom of the current display lines is below the bottom of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233 desired display lines. Note that the number of lines is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 irrelevant. Only the position matters. We also clear to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235 bottom of the window if the modeline has shifted position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1236 /* #### We can't blindly not clear the bottom if f->clear is true
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1237 since there might be a window-local background. However, for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238 those cases where there isn't, clearing the end of the window in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1239 this case sucks. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1240 if (!need_to_clear_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242 struct display_line *cdl, *ddl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1244 /* If the modeline has changed position or size, clear the bottom
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 of the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246 if (!need_to_clear_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1248 cdl = ddl = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1249
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1250 if (cdla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1251 cdl = Dynarr_atp (cdla, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1252 if (ddla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253 ddl = Dynarr_atp (ddla, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1255 if (!cdl || !ddl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1256 need_to_clear_bottom = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257 else if ((!cdl->modeline && ddl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258 || (cdl->modeline && !ddl->modeline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259 need_to_clear_bottom = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260 else if (cdl->ypos != ddl->ypos ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261 cdl->ascent != ddl->ascent ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262 cdl->descent != ddl->descent ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263 cdl->clip != ddl->clip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 need_to_clear_bottom = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1266 /* #### This kludge is to make sure the modeline shadows get
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1267 redrawn if the modeline position shifts. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1268 if (need_to_clear_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269 w->shadow_thickness_changed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1270 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1271
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1272 if (!need_to_clear_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1273 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1274 cdl = ddl = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1275
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1276 if (cdla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1277 cdl = Dynarr_atp (cdla, cdla_len - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1278 if (ddla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1279 ddl = Dynarr_atp (ddla, ddla_len - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1280
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1281 if (!cdl || !ddl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1282 need_to_clear_bottom = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1283 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1284 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1285 int cdl_bottom, ddl_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1286
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1287 cdl_bottom = cdl->ypos + cdl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1288 ddl_bottom = ddl->ypos + ddl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1289
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1290 if (cdl_bottom > ddl_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1291 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1292 need_to_clear_bottom = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1293 need_to_clear_start = ddl_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1294 need_to_clear_end = cdl_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1295 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1296 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1297 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1298 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1299
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1300 /* Perform any output initialization. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1301 DEVMETH (d, output_begin, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1302
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1303 /* If the window's structure has changed clear the internal border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1304 above it if it is topmost (the function will check). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1305 if (f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1306 redisplay_clear_top_of_window (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1307
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1308 /* Output each line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1309 for (line = 0; line < Dynarr_length (ddla); line++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1310 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1311 output_display_line (w, cdla, ddla, line, -1, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1312 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1313
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1314 /* If the number of display lines has shrunk, adjust. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1315 if (cdla_len > ddla_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1316 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1317 Dynarr_length (cdla) = ddla_len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1318 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1319
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1320 /* Output a vertical divider between windows, if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1321 if (window_needs_vertical_divider (w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1322 && (f->windows_structure_changed || f->clear))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1323 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1324 DEVMETH (d, output_vertical_divider, (w, f->windows_structure_changed));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1325 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1326
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1327 /* Clear the rest of the window, if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1328 if (need_to_clear_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1329 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1330 redisplay_clear_bottom_of_window (w, ddla, need_to_clear_start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1331 need_to_clear_end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1332 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1333
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1334 w->window_end_pos[CURRENT_DISP] = w->window_end_pos[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1335 Fset_marker (w->start[CURRENT_DISP],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1336 make_int (marker_position (w->start[DESIRED_DISP])),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1337 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1338 Fset_marker (w->pointm[CURRENT_DISP],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1339 make_int (marker_position (w->pointm[DESIRED_DISP])),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1340 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1341 w->last_modified[CURRENT_DISP] = w->last_modified[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1342 w->last_facechange[CURRENT_DISP] = w->last_facechange[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1343 Fset_marker (w->last_start[CURRENT_DISP],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1344 Fmarker_position (w->last_start[DESIRED_DISP]), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1345 Fset_marker (w->last_point[CURRENT_DISP],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1346 Fmarker_position (w->last_point[DESIRED_DISP]), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1347 w->last_point_x[CURRENT_DISP] = w->last_point_x[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1348 w->last_point_y[CURRENT_DISP] = w->last_point_y[DESIRED_DISP];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1349 w->shadow_thickness_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1350
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 set_window_display_buffer (w, XBUFFER (w->buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352 find_window_mirror (w)->truncate_win = window_truncation_on (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354 /* Overkill on invalidating the cache. It is very bad for it to not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355 get invalidated when it should be. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356 INVALIDATE_DEVICE_PIXEL_TO_GLYPH_CACHE (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358 /* We don't call output_end for tty frames. Redisplay will do this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 after all tty windows have been updated. This cuts down on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360 cursor flicker. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 if (FRAME_TTY_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362 redisplay_redraw_cursor (f, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364 DEVMETH (d, output_end, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1366 #ifdef HAVE_SCROLLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367 update_window_scrollbars (w, NULL, !MINI_WINDOW_P (w), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369 }