annotate src/redisplay-output.c @ 398:74fd4e045ea6 r21-2-29

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